RE1-T111 PR#315 fixes

Author: ucswift

Core/Resgrid.Services/CommunicationService.cs

@@ -408,8 +408,15 @@ public async Task<bool> SendCancelCallAsync(Call call, CallDispatch dispatch, st
 			{
 				if (profile == null || profile.MobileNumberVerified.IsContactMethodAllowedForSending())
 				{
-					var payment = await _subscriptionsService.GetCurrentPaymentForDepartmentAsync(departmentId);
-					await _smsService.SendCancelCallAsync(call, dispatch, departmentNumber, departmentId, profile, call.Address, payment);
+					try
+					{
+						var payment = await _subscriptionsService.GetCurrentPaymentForDepartmentAsync(departmentId);
+						await _smsService.SendCancelCallAsync(call, dispatch, departmentNumber, departmentId, profile, call.Address, payment);
+					}
+					catch (Exception ex)
+					{
+						Logging.LogException(ex);
+					}
 				}
 			}
 
@@ -418,7 +425,14 @@ public async Task<bool> SendCancelCallAsync(Call call, CallDispatch dispatch, st
 			{
 				if (profile == null || profile.EmailVerified.IsContactMethodAllowedForSending())
 				{
-					await _emailService.SendCancelCallAsync(call, dispatch, profile);
+					try
+					{
+						await _emailService.SendCancelCallAsync(call, dispatch, profile);
+					}
+					catch (Exception ex)
+					{
+						Logging.LogException(ex);
+					}
 				}
 			}
 

Web/Resgrid.Web.Services/Controllers/v4/CommunicationTestsController.cs

@@ -271,20 +271,22 @@ public async Task<StandardApiResponseV4Base> Delete(string id, CancellationToken
 				return result;
 			}
 
+			var beforeJson = test.CloneJsonToString();
+
+			await _communicationTestService.DeleteTestAsync(testId, cancellationToken);
+
 			_eventAggregator.SendMessage<AuditEvent>(new AuditEvent
 			{
 				DepartmentId = DepartmentId,
 				UserId = UserId,
 				Type = AuditLogTypes.CommunicationTestDeleted,
-				Before = test.CloneJsonToString(),
+				Before = beforeJson,
 				Successful = true,
 				IpAddress = IpAddressHelper.GetRequestIP(Request, true),
 				ServerName = Environment.MachineName,
 				UserAgent = $"{Request.Headers["User-Agent"]} {Request.Headers["Accept-Language"]}"
 			});
 
-			await _communicationTestService.DeleteTestAsync(testId, cancellationToken);
-
 			result.Status = ResponseHelper.Deleted;
 			ResponseHelper.PopulateV4ResponseData(result);
 

Web/Resgrid.Web/Areas/User/Controllers/CommunicationTestController.cs

@@ -216,20 +216,22 @@ public async Task<IActionResult> Delete(string testId, CancellationToken cancell
 			if (test == null || test.DepartmentId != DepartmentId)
 				return Unauthorized();
 
+			var beforeJson = test.CloneJsonToString();
+
+			await _communicationTestService.DeleteTestAsync(id, cancellationToken);
+
 			_eventAggregator.SendMessage<AuditEvent>(new AuditEvent
 			{
 				DepartmentId = DepartmentId,
 				UserId = UserId,
 				Type = AuditLogTypes.CommunicationTestDeleted,
-				Before = test.CloneJsonToString(),
+				Before = beforeJson,
 				Successful = true,
 				IpAddress = IpAddressHelper.GetRequestIP(Request, true),
 				ServerName = Environment.MachineName,
 				UserAgent = $"{Request.Headers["User-Agent"]} {Request.Headers["Accept-Language"]}"
 			});
 
-			await _communicationTestService.DeleteTestAsync(id, cancellationToken);
-
 			return RedirectToAction("Index");
 		}
 

Web/Resgrid.Web/Areas/User/Controllers/DispatchController.cs

@@ -641,10 +641,10 @@ public async Task<IActionResult> UpdateCall(UpdateCallView model, IFormCollectio
 					call.IndoorMapFloorId = null;
 				}
 
-				List<CallDispatch> existingDispatches = new List<CallDispatch>(call.Dispatches);
-				List<CallDispatchGroup> existingGroupDispatches = new List<CallDispatchGroup>(call.GroupDispatches);
-				List<CallDispatchUnit> existingUnitDispatches = new List<CallDispatchUnit>(call.UnitDispatches);
-				List<CallDispatchRole> existingRoleDispatches = new List<CallDispatchRole>(call.RoleDispatches);
+				List<CallDispatch> existingDispatches = new List<CallDispatch>(call.Dispatches ?? Enumerable.Empty<CallDispatch>());
+				List<CallDispatchGroup> existingGroupDispatches = new List<CallDispatchGroup>(call.GroupDispatches ?? Enumerable.Empty<CallDispatchGroup>());
+				List<CallDispatchUnit> existingUnitDispatches = new List<CallDispatchUnit>(call.UnitDispatches ?? Enumerable.Empty<CallDispatchUnit>());
+				List<CallDispatchRole> existingRoleDispatches = new List<CallDispatchRole>(call.RoleDispatches ?? Enumerable.Empty<CallDispatchRole>());
 
 				List<string> dispatchingUserIds = new List<string>();
 				List<int> dispatchingGroupIds = new List<int>();
@@ -893,10 +893,10 @@ public async Task<IActionResult> UpdateCall(UpdateCallView model, IFormCollectio
 				// Send cancel notifications to removed entities
 				if (model.NotifyCancelledEntities)
 				{
-					var savedUserIds = new HashSet<string>(call.Dispatches.Select(x => x.UserId));
-					var savedGroupIds = new HashSet<int>(call.GroupDispatches.Select(x => x.DepartmentGroupId));
-					var savedUnitIds = new HashSet<int>(call.UnitDispatches.Select(x => x.UnitId));
-					var savedRoleIds = new HashSet<int>(call.RoleDispatches.Select(x => x.RoleId));
+					var savedUserIds = new HashSet<string>((call.Dispatches ?? Enumerable.Empty<CallDispatch>()).Select(x => x.UserId));
+					var savedGroupIds = new HashSet<int>((call.GroupDispatches ?? Enumerable.Empty<CallDispatchGroup>()).Select(x => x.DepartmentGroupId));
+					var savedUnitIds = new HashSet<int>((call.UnitDispatches ?? Enumerable.Empty<CallDispatchUnit>()).Select(x => x.UnitId));
+					var savedRoleIds = new HashSet<int>((call.RoleDispatches ?? Enumerable.Empty<CallDispatchRole>()).Select(x => x.RoleId));
 
 					var cancelledUserIds = existingDispatches.Select(x => x.UserId)
 						.Where(y => !savedUserIds.Contains(y)).ToList();
@@ -912,13 +912,13 @@ public async Task<IActionResult> UpdateCall(UpdateCallView model, IFormCollectio
 						var departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(DepartmentId);
 
 						// Build set of still-dispatched user IDs for dedup
-						var stillDispatchedUserIds = new HashSet<string>(call.Dispatches.Select(x => x.UserId));
-						foreach (var gd in call.GroupDispatches)
+						var stillDispatchedUserIds = new HashSet<string>((call.Dispatches ?? Enumerable.Empty<CallDispatch>()).Select(x => x.UserId));
+						foreach (var gd in call.GroupDispatches ?? Enumerable.Empty<CallDispatchGroup>())
 						{
 							var members = await _departmentGroupsService.GetAllMembersForGroupAsync(gd.DepartmentGroupId);
 							foreach (var m in members) stillDispatchedUserIds.Add(m.UserId);
 						}
-						foreach (var rd in call.RoleDispatches)
+						foreach (var rd in call.RoleDispatches ?? Enumerable.Empty<CallDispatchRole>())
 						{
 							var members = await _personnelRolesService.GetAllMembersOfRoleAsync(rd.RoleId);
 							foreach (var m in members) stillDispatchedUserIds.Add(m.UserId);