Merge pull request #221 from Resgrid/develop

CU-868d85dv8 More worker fix

Author: ucswift

Core/Resgrid.Services/NotificationService.cs

@@ -455,19 +455,31 @@ public async Task<DepartmentGroup> GetGroupForEventAsync(ProcessedNotification n
 				if (notification.Type == EventTypes.UnitStatusChanged)
 				{
 					var unitEvent = await _unitsService.GetUnitStateByIdAsync(dynamicData.StateId);
-					return await _departmentGroupsService.GetGroupByIdAsync(unitEvent.Unit.StationGroupId.GetValueOrDefault());
+
+					if (unitEvent != null)
+					{
+						return await _departmentGroupsService.GetGroupByIdAsync(unitEvent.Unit.StationGroupId.GetValueOrDefault());
+					}
 				}
 				else if (notification.Type == EventTypes.PersonnelStatusChanged)
 				{
 					var userStaffing = await _userStateService.GetUserStateByIdAsync(dynamicData.StateId);
-					var group = await _departmentGroupsService.GetGroupForUserAsync(userStaffing.UserId, notification.DepartmentId);
-					return group;
+
+					if (userStaffing != null)
+					{
+						var group = await _departmentGroupsService.GetGroupForUserAsync(userStaffing.UserId, notification.DepartmentId);
+						return group;
+					}
 				}
 				else if (notification.Type == EventTypes.PersonnelStatusChanged)
 				{
 					var actionLog = await _actionLogsService.GetActionLogByIdAsync(dynamicData.StateId);
-					var group = await _departmentGroupsService.GetGroupForUserAsync(actionLog.UserId, notification.DepartmentId);
-					return group;
+
+					if (actionLog != null)
+					{
+						var group = await _departmentGroupsService.GetGroupForUserAsync(actionLog.UserId, notification.DepartmentId);
+						return group;
+					}
 				}
 				else if (notification.Type == EventTypes.UserAssignedToGroup)
 				{