CU-8687aj3gt Added logic for department code in Notification pushes

ucswift · ucswift · commit 55313dca4c21 · 2025-08-13T16:45:13.000-07:00
diff --git a/Core/Resgrid.Model/Services/ICommunicationService.cs b/Core/Resgrid.Model/Services/ICommunicationService.cs
@@ -55,7 +55,7 @@ Task<bool> SendUnitCallAsync(Call call, CallDispatchUnit dispatch, string depart
 		/// <param name="title">The title.</param>
 		/// <param name="profile">The profile.</param>
 		/// <returns>Task&lt;System.Boolean&gt;.</returns>
-		Task<bool> SendNotificationAsync(string userId, int departmentId, string message, string departmentNumber,
+		Task<bool> SendNotificationAsync(string userId, int departmentId, string message, string departmentNumber, Department department, 
 			string title = "Notification", UserProfile profile = null);
 
 		/// <summary>
diff --git a/Core/Resgrid.Services/CalendarService.cs b/Core/Resgrid.Services/CalendarService.cs
@@ -487,9 +487,9 @@ public async Task<bool> NotifyNewCalendarItemAsync(CalendarItem calendarItem)
 									foreach (var member in group.Members)
 									{
 										if (profiles.ContainsKey(member.UserId))
-											await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, title, profiles[member.UserId]);
+											await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, department, title, profiles[member.UserId]);
 										else
-											await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, title, null);
+											await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, department, title, null);
 									}
 								}
 							}
diff --git a/Core/Resgrid.Services/CommunicationService.cs b/Core/Resgrid.Services/CommunicationService.cs
@@ -290,7 +290,7 @@ public async Task<bool> SendUnitCallAsync(Call call, CallDispatchUnit dispatch,
 			return true;
 		}
 
-		public async Task<bool> SendNotificationAsync(string userId, int departmentId, string message, string departmentNumber, string title = "Notification", UserProfile profile = null)
+		public async Task<bool> SendNotificationAsync(string userId, int departmentId, string message, string departmentNumber, Department department, string title = "Notification", UserProfile profile = null)
 		{
 			if (Config.SystemBehaviorConfig.DoNotBroadcast && !Config.SystemBehaviorConfig.BypassDoNotBroadcastDepartments.Contains(departmentId))
 				return false;
@@ -319,6 +319,7 @@ public async Task<bool> SendNotificationAsync(string userId, int departmentId, s
 				var spm = new StandardPushMessage();
 				spm.Title = "Notification";
 				spm.SubTitle = $"{title} {message}";
+				spm.DepartmentCode = department?.Code;
 
 				try
 				{
diff --git a/Core/Resgrid.Services/TrainingService.cs b/Core/Resgrid.Services/TrainingService.cs
@@ -180,7 +180,9 @@ public async Task<bool> SendInitialTrainingNoticeAsync(Training training)
 				else
 					message = string.Format("Training ({0}) assigned to you", training.Name);
 
-				await _communicationService.SendNotificationAsync(user.UserId, training.DepartmentId, message, "New Training");
+				var department = await _departmentService.GetDepartmentByIdAsync(training.DepartmentId);
+
+				await _communicationService.SendNotificationAsync(user.UserId, training.DepartmentId, message, "New Training", department);
 			}
 
 			return true;
diff --git a/Providers/Resgrid.Providers.Messaging/NovuProvider.cs b/Providers/Resgrid.Providers.Messaging/NovuProvider.cs
@@ -21,7 +21,7 @@ private async Task<bool> CreateSubscriber(string id, int departmentId, string em
 				{
 					var requestUrl = $"{ChatConfig.NovuBackendUrl}/v2/subscribers";
 					httpClient.DefaultRequestHeaders.Add("idempotency-key", Guid.NewGuid().ToString());
-					httpClient.DefaultRequestHeaders.Add("Authorization", Config.ChatConfig.NovuSecretKey);
+					httpClient.DefaultRequestHeaders.Add("Authorization", $"ApiKey {ChatConfig.NovuSecretKey}");
 
 					var payload = new
 					{
@@ -45,7 +45,8 @@ private async Task<bool> CreateSubscriber(string id, int departmentId, string em
 							payload.data.Add(item.Key, item.Value);
 						}
 					}
-					string jsonContent = JsonConvert.SerializeObject(payload);
+
+					string jsonContent = JsonConvert.SerializeObject(payload, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
 
 					var content = new StringContent(jsonContent, Encoding.UTF8, "application/json");
 
@@ -115,7 +116,7 @@ private async Task<bool> UpdateSubscriberFcm(string id, string token, string fcm
 						},
 						integrationIdentifier = fcmId
 					};
-					string jsonContent = JsonConvert.SerializeObject(payload);
+					string jsonContent = JsonConvert.SerializeObject(payload, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
 
 					request.Content = new StringContent(jsonContent, Encoding.UTF8, "application/json");
 					HttpResponseMessage response = await client.SendAsync(request);
@@ -151,7 +152,7 @@ private async Task<bool> UpdateSubscriberApns(string id, string token, string ap
 						},
 						integrationIdentifier = apnsId
 					};
-					string jsonContent = JsonConvert.SerializeObject(payload);
+					string jsonContent = JsonConvert.SerializeObject(payload, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
 
 					request.Content = new StringContent(jsonContent, Encoding.UTF8, "application/json");
 					HttpResponseMessage response = await client.SendAsync(request);
@@ -272,10 +273,12 @@ private async Task<bool> SendNotification(string title, string body, string reci
 					};
 
 					var content = new StringContent(
-						JsonConvert.SerializeObject(payload),
+						JsonConvert.SerializeObject(payload, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
 						Encoding.UTF8,
 						"application/json");
 
+
+
 					var result = await httpClient.PostAsync("v1/events/trigger", content);
 
 					return result.IsSuccessStatusCode;
diff --git a/Workers/Resgrid.Workers.Framework/Logic/CalendarNotifierLogic.cs b/Workers/Resgrid.Workers.Framework/Logic/CalendarNotifierLogic.cs
@@ -57,7 +57,7 @@ public async Task<Tuple<bool,string>> Process(CalendarNotifierQueueItem item)
 						foreach (var person in item.CalendarItem.Attendees)
 						{
 							var profile = profiles.FirstOrDefault(x => x.UserId == person.UserId);
-							await _communicationService.SendNotificationAsync(person.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, title, profile);
+							await _communicationService.SendNotificationAsync(person.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, department, title, profile);
 						}
 					}
 				}
@@ -96,7 +96,7 @@ public async Task<Tuple<bool,string>> Process(CalendarNotifierQueueItem item)
 						// Notify the entire department
 						foreach (var profile in profiles)
 						{
-							await _communicationService.SendNotificationAsync(profile.Key, item.CalendarItem.DepartmentId, message, departmentNumber, title, profile.Value);
+							await _communicationService.SendNotificationAsync(profile.Key, item.CalendarItem.DepartmentId, message, departmentNumber, department, title, profile.Value);
 						}
 					}
 					else
@@ -114,9 +114,9 @@ public async Task<Tuple<bool,string>> Process(CalendarNotifierQueueItem item)
 									foreach (var member in group.Members)
 									{
 										if (profiles.ContainsKey(member.UserId))
-											await _communicationService.SendNotificationAsync(member.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, title, profiles[member.UserId]);
+											await _communicationService.SendNotificationAsync(member.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, department, title, profiles[member.UserId]);
 										else
-											await _communicationService.SendNotificationAsync(member.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, title, null);
+											await _communicationService.SendNotificationAsync(member.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, department, title, null);
 									}
 								}
 							}
diff --git a/Workers/Resgrid.Workers.Framework/Logic/NotificationBroadcastLogic.cs b/Workers/Resgrid.Workers.Framework/Logic/NotificationBroadcastLogic.cs
@@ -70,7 +70,7 @@ public static async Task<bool> ProcessNotificationItem(NotificationItem ni, stri
 										if (!_notificationService.AllowToSendViaSms(notification.Type))
 											profile.SendNotificationSms = false;
 
-										await _communicationService.SendNotificationAsync(user, notification.DepartmentId, text, queueItem.DepartmentTextNumber, "Notification", profile);
+										await _communicationService.SendNotificationAsync(user, notification.DepartmentId, text, queueItem.DepartmentTextNumber, queueItem.Department, "Notification", profile);
 									}
 								}
 							}
diff --git a/Workers/Resgrid.Workers.Framework/Logic/ShiftNotificationLogic.cs b/Workers/Resgrid.Workers.Framework/Logic/ShiftNotificationLogic.cs
@@ -17,6 +17,9 @@ public static async Task<bool> ProcessShiftQueueItem(ShiftQueueItem sqi)
 				var _shiftsService = Bootstrapper.GetKernel().Resolve<IShiftsService>();
 				var _communicationService = Bootstrapper.GetKernel().Resolve<ICommunicationService>();
 				var _userProfileService = Bootstrapper.GetKernel().Resolve<IUserProfileService>();
+				var _departmentService = Bootstrapper.GetKernel().Resolve<IDepartmentsService>();
+
+				var department = await _departmentService.GetDepartmentByIdAsync(sqi.DepartmentId, false);
 
 				if (sqi.Type == (int)ShiftQueueTypes.TradeRequested)
 				{
@@ -28,7 +31,7 @@ public static async Task<bool> ProcessShiftQueueItem(ShiftQueueItem sqi)
 					foreach (var user in tradeRequest.Users)
 					{
 						UserProfile profile = userProfiles.FirstOrDefault(x => x.UserId == user.UserId);
-						await _communicationService.SendNotificationAsync(user.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber,
+						await _communicationService.SendNotificationAsync(user.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber, department,
 							tradeRequest.SourceShiftSignup.Shift.Name, profile);
 					}
 				}
@@ -40,7 +43,7 @@ await _communicationService.SendNotificationAsync(user.UserId, tradeRequest.Sour
 
 					var text = _shiftsService.GenerateShiftTradeRejectionText(targetUserProfile, tradeRequest);
 
-					await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber,
+					await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber, department,
 							tradeRequest.SourceShiftSignup.Shift.Name, sourceUserProfile);
 				}
 				else if (sqi.Type == (int)ShiftQueueTypes.TradeProposed && !String.IsNullOrWhiteSpace(sqi.SourceUserId))
@@ -51,7 +54,7 @@ await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, trad
 
 					var text = _shiftsService.GenerateShiftTradeProposedText(proposedUserProfile, tradeRequest);
 
-					await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber,
+					await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber, department,
 							tradeRequest.SourceShiftSignup.Shift.Name, sourceUserProfile);
 				}
 				else if (sqi.Type == (int)ShiftQueueTypes.TradeFilled && !String.IsNullOrWhiteSpace(sqi.SourceUserId))
@@ -62,7 +65,7 @@ await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, trad
 
 					var text = _shiftsService.GenerateShiftTradeFilledText(sourceUserProfile, tradeRequest);
 
-					await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber,
+					await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber, department,
 							tradeRequest.SourceShiftSignup.Shift.Name, proposedUserProfile);
 				}
 				else if (sqi.Type == (int)ShiftQueueTypes.ShiftCreated)
@@ -74,7 +77,7 @@ await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tr
 
 					foreach (var profile in profiles.Select(x => x.Value))
 					{
-						await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, "New Shift", profile);
+						await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, "New Shift", profile);
 					}
 				}
 				else if (sqi.Type == (int)ShiftQueueTypes.ShiftUpdated)
@@ -87,9 +90,9 @@ await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tr
 					foreach (var profile in shift.Personnel)
 					{
 						if (profiles.ContainsKey(profile.UserId))
-							await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, shift.Name, profiles[profile.UserId]);
+							await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, shift.Name, profiles[profile.UserId]);
 						else
-							await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, shift.Name);
+							await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, shift.Name);
 					}
 				}
 				else if (sqi.Type == (int)ShiftQueueTypes.ShiftDaysAdded)
@@ -104,9 +107,9 @@ await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tr
 						foreach (var profile in shift.Personnel)
 						{
 							if (profiles.ContainsKey(profile.UserId))
-								await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, shift.Name, profiles[profile.UserId]);
+								await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, shift.Name, profiles[profile.UserId]);
 							else
-								await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, shift.Name);
+								await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, shift.Name);
 						}
 					}
 				}
diff --git a/Workers/Resgrid.Workers.Framework/Logic/ShiftNotifierLogic.cs b/Workers/Resgrid.Workers.Framework/Logic/ShiftNotifierLogic.cs
@@ -14,12 +14,14 @@ public class ShiftNotifierLogic
 		private IShiftsService _shiftsService;
 		private ICommunicationService _communicationService;
 		private IDepartmentSettingsService _departmentSettingsService;
+		private IDepartmentsService _departmentsService;
 
 		public ShiftNotifierLogic()
 		{
 			_shiftsService = Bootstrapper.GetKernel().Resolve<IShiftsService>();
 			_communicationService = Bootstrapper.GetKernel().Resolve<ICommunicationService>();
 			_departmentSettingsService = Bootstrapper.GetKernel().Resolve<IDepartmentSettingsService>();
+			_departmentsService = Bootstrapper.GetKernel().Resolve<IDepartmentsService>();
 		}
 
 		public async Task<Tuple<bool, string>> Process(ShiftNotifierQueueItem item)
@@ -31,6 +33,7 @@ public async Task<Tuple<bool, string>> Process(ShiftNotifierQueueItem item)
 			{
 				var text = _shiftsService.GenerateShiftNotificationText(item.Shift);
 				string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(item.Shift.DepartmentId);
+				var department = await _departmentsService.GetDepartmentByIdAsync(item.Shift.DepartmentId, false);
 
 				if (ConfigHelper.CanTransmit(item.Shift.DepartmentId))
 				{
@@ -39,7 +42,7 @@ public async Task<Tuple<bool, string>> Process(ShiftNotifierQueueItem item)
 						foreach (var person in item.Shift.Personnel)
 						{
 							UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == person.UserId);
-							await _communicationService.SendNotificationAsync(person.UserId, item.Shift.DepartmentId, text, departmentNumber,
+							await _communicationService.SendNotificationAsync(person.UserId, item.Shift.DepartmentId, text, departmentNumber, department,
 								item.Shift.Name, profile);
 						}
 					}
@@ -53,26 +56,26 @@ await _communicationService.SendNotificationAsync(person.UserId, item.Shift.Depa
 								if (!String.IsNullOrWhiteSpace(signup.Trade.UserId))
 								{
 									UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == signup.Trade.UserId);
-									await _communicationService.SendNotificationAsync(signup.Trade.UserId, item.Shift.DepartmentId, text, departmentNumber,
+									await _communicationService.SendNotificationAsync(signup.Trade.UserId, item.Shift.DepartmentId, text, departmentNumber, department,
 										item.Shift.Name, profile);
 								}
 								else if (signup.GetTradeType() == ShiftTradeTypes.Source)
 								{
 									UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == signup.Trade.TargetShiftSignup.UserId);
-									await _communicationService.SendNotificationAsync(signup.Trade.TargetShiftSignup.UserId, item.Shift.DepartmentId, text, departmentNumber,
+									await _communicationService.SendNotificationAsync(signup.Trade.TargetShiftSignup.UserId, item.Shift.DepartmentId, text, departmentNumber, department,
 										item.Shift.Name, profile);
 								}
 								else if (signup.GetTradeType() == ShiftTradeTypes.Target)
 								{
 									UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == signup.Trade.SourceShiftSignup.UserId);
-									await _communicationService.SendNotificationAsync(signup.Trade.SourceShiftSignup.UserId, item.Shift.DepartmentId, text, departmentNumber,
+									await _communicationService.SendNotificationAsync(signup.Trade.SourceShiftSignup.UserId, item.Shift.DepartmentId, text, departmentNumber, department,
 										item.Shift.Name, profile);
 								}
 							}
 							else
 							{
 								UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == signup.UserId);
-								await _communicationService.SendNotificationAsync(signup.UserId, item.Shift.DepartmentId, text, departmentNumber,
+								await _communicationService.SendNotificationAsync(signup.UserId, item.Shift.DepartmentId, text, departmentNumber, department,
 									item.Shift.Name, profile);
 							}
 						}
diff --git a/Workers/Resgrid.Workers.Framework/Logic/TrainingNotifierLogic.cs b/Workers/Resgrid.Workers.Framework/Logic/TrainingNotifierLogic.cs
@@ -14,13 +14,15 @@ public class TrainingNotifierLogic
 		private ICommunicationService _communicationService;
 		private IUserProfileService _userProfileService;
 		private IDepartmentSettingsService _departmentSettingsService;
+		private IDepartmentsService _departmentsService;
 
 		public TrainingNotifierLogic()
 		{
 			_trainingService = Bootstrapper.GetKernel().Resolve<ITrainingService>();
 			_communicationService = Bootstrapper.GetKernel().Resolve<ICommunicationService>();
 			_userProfileService = Bootstrapper.GetKernel().Resolve<IUserProfileService>();
 			_departmentSettingsService = Bootstrapper.GetKernel().Resolve<IDepartmentSettingsService>();
+			_departmentsService = Bootstrapper.GetKernel().Resolve<IDepartmentsService>();
 		}
 
 		public async Task<Tuple<bool, string>> Process(TrainingNotifierQueueItem item)
@@ -34,6 +36,7 @@ public async Task<Tuple<bool, string>> Process(TrainingNotifierQueueItem item)
 				var title = String.Empty;
 				var profiles = await _userProfileService.GetSelectedUserProfilesAsync(item.Training.Users.Select(x => x.UserId).ToList());
 				var departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(item.Training.DepartmentId);
+				var department = await _departmentsService.GetDepartmentByIdAsync(item.Training.DepartmentId, false);
 
 				if (ConfigHelper.CanTransmit(item.Training.DepartmentId))
 				{
@@ -57,7 +60,7 @@ public async Task<Tuple<bool, string>> Process(TrainingNotifierQueueItem item)
 						var profile = profiles.FirstOrDefault(x => x.UserId == person.UserId);
 
 						if (!item.Training.Notified.HasValue || !person.Complete)
-							await _communicationService.SendNotificationAsync(person.UserId, item.Training.DepartmentId, message, departmentNumber, title, profile);
+							await _communicationService.SendNotificationAsync(person.UserId, item.Training.DepartmentId, message, departmentNumber, department, title, profile);
 
 						title = "Training Due Notice";
 					}

Original file line number	Diff line number	Diff line change
`@@ -487,9 +487,9 @@ public async Task<bool> NotifyNewCalendarItemAsync(CalendarItem calendarItem)`
`487`	`487`	`foreach (var member in group.Members)`
`488`	`488`	`{`
`489`	`489`	`if (profiles.ContainsKey(member.UserId))`
`490`		`- await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, title, profiles[member.UserId]);`
	`490`	`+ await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, department, title, profiles[member.UserId]);`
`491`	`491`	`else`
`492`		`- await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, title, null);`
	`492`	`+ await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, department, title, null);`
`493`	`493`	`}`
`494`	`494`	`}`
`495`	`495`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public async Task<bool> SendUnitCallAsync(Call call, CallDispatchUnit dispatch,`
`290`	`290`	`return true;`
`291`	`291`	`}`
`292`	`292`
`293`		`- public async Task<bool> SendNotificationAsync(string userId, int departmentId, string message, string departmentNumber, string title = "Notification", UserProfile profile = null)`
	`293`	`+ public async Task<bool> SendNotificationAsync(string userId, int departmentId, string message, string departmentNumber, Department department, string title = "Notification", UserProfile profile = null)`
`294`	`294`	`{`
`295`	`295`	`if (Config.SystemBehaviorConfig.DoNotBroadcast && !Config.SystemBehaviorConfig.BypassDoNotBroadcastDepartments.Contains(departmentId))`
`296`	`296`	`return false;`
`@@ -319,6 +319,7 @@ public async Task<bool> SendNotificationAsync(string userId, int departmentId, s`
`319`	`319`	`var spm = new StandardPushMessage();`
`320`	`320`	`spm.Title = "Notification";`
`321`	`321`	`spm.SubTitle = $"{title} {message}";`
	`322`	`+ spm.DepartmentCode = department?.Code;`
`322`	`323`
`323`	`324`	`try`
`324`	`325`	`{`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,9 @@ public async Task<bool> SendInitialTrainingNoticeAsync(Training training)`
`180`	`180`	`else`
`181`	`181`	`message = string.Format("Training ({0}) assigned to you", training.Name);`
`182`	`182`
`183`		`- await _communicationService.SendNotificationAsync(user.UserId, training.DepartmentId, message, "New Training");`
	`183`	`+ var department = await _departmentService.GetDepartmentByIdAsync(training.DepartmentId);`
	`184`	`+`
	`185`	`+ await _communicationService.SendNotificationAsync(user.UserId, training.DepartmentId, message, "New Training", department);`
`184`	`186`	`}`
`185`	`187`
`186`	`188`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public async Task<Tuple<bool,string>> Process(CalendarNotifierQueueItem item)`
`57`	`57`	`foreach (var person in item.CalendarItem.Attendees)`
`58`	`58`	`{`
`59`	`59`	`var profile = profiles.FirstOrDefault(x => x.UserId == person.UserId);`
`60`		`- await _communicationService.SendNotificationAsync(person.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, title, profile);`
	`60`	`+ await _communicationService.SendNotificationAsync(person.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, department, title, profile);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
`@@ -96,7 +96,7 @@ public async Task<Tuple<bool,string>> Process(CalendarNotifierQueueItem item)`
`96`	`96`	`// Notify the entire department`
`97`	`97`	`foreach (var profile in profiles)`
`98`	`98`	`{`
`99`		`- await _communicationService.SendNotificationAsync(profile.Key, item.CalendarItem.DepartmentId, message, departmentNumber, title, profile.Value);`
	`99`	`+ await _communicationService.SendNotificationAsync(profile.Key, item.CalendarItem.DepartmentId, message, departmentNumber, department, title, profile.Value);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`else`
`@@ -114,9 +114,9 @@ public async Task<Tuple<bool,string>> Process(CalendarNotifierQueueItem item)`
`114`	`114`	`foreach (var member in group.Members)`
`115`	`115`	`{`
`116`	`116`	`if (profiles.ContainsKey(member.UserId))`
`117`		`- await _communicationService.SendNotificationAsync(member.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, title, profiles[member.UserId]);`
	`117`	`+ await _communicationService.SendNotificationAsync(member.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, department, title, profiles[member.UserId]);`
`118`	`118`	`else`
`119`		`- await _communicationService.SendNotificationAsync(member.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, title, null);`
	`119`	`+ await _communicationService.SendNotificationAsync(member.UserId, item.CalendarItem.DepartmentId, message, departmentNumber, department, title, null);`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static async Task<bool> ProcessNotificationItem(NotificationItem ni, stri`
`70`	`70`	`if (!_notificationService.AllowToSendViaSms(notification.Type))`
`71`	`71`	`profile.SendNotificationSms = false;`
`72`	`72`
`73`		`- await _communicationService.SendNotificationAsync(user, notification.DepartmentId, text, queueItem.DepartmentTextNumber, "Notification", profile);`
	`73`	`+ await _communicationService.SendNotificationAsync(user, notification.DepartmentId, text, queueItem.DepartmentTextNumber, queueItem.Department, "Notification", profile);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ public static async Task<bool> ProcessShiftQueueItem(ShiftQueueItem sqi)`
`17`	`17`	`var _shiftsService = Bootstrapper.GetKernel().Resolve<IShiftsService>();`
`18`	`18`	`var _communicationService = Bootstrapper.GetKernel().Resolve<ICommunicationService>();`
`19`	`19`	`var _userProfileService = Bootstrapper.GetKernel().Resolve<IUserProfileService>();`
	`20`	`+ var _departmentService = Bootstrapper.GetKernel().Resolve<IDepartmentsService>();`
	`21`	`+`
	`22`	`+ var department = await _departmentService.GetDepartmentByIdAsync(sqi.DepartmentId, false);`
`20`	`23`
`21`	`24`	`if (sqi.Type == (int)ShiftQueueTypes.TradeRequested)`
`22`	`25`	`{`
`@@ -28,7 +31,7 @@ public static async Task<bool> ProcessShiftQueueItem(ShiftQueueItem sqi)`
`28`	`31`	`foreach (var user in tradeRequest.Users)`
`29`	`32`	`{`
`30`	`33`	`UserProfile profile = userProfiles.FirstOrDefault(x => x.UserId == user.UserId);`
`31`		`- await _communicationService.SendNotificationAsync(user.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber,`
	`34`	`+ await _communicationService.SendNotificationAsync(user.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber, department,`
`32`	`35`	`tradeRequest.SourceShiftSignup.Shift.Name, profile);`
`33`	`36`	`}`
`34`	`37`	`}`
`@@ -40,7 +43,7 @@ await _communicationService.SendNotificationAsync(user.UserId, tradeRequest.Sour`
`40`	`43`
`41`	`44`	`var text = _shiftsService.GenerateShiftTradeRejectionText(targetUserProfile, tradeRequest);`
`42`	`45`
`43`		`- await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber,`
	`46`	`+ await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber, department,`
`44`	`47`	`tradeRequest.SourceShiftSignup.Shift.Name, sourceUserProfile);`
`45`	`48`	`}`
`46`	`49`	`else if (sqi.Type == (int)ShiftQueueTypes.TradeProposed && !String.IsNullOrWhiteSpace(sqi.SourceUserId))`
`@@ -51,7 +54,7 @@ await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, trad`
`51`	`54`
`52`	`55`	`var text = _shiftsService.GenerateShiftTradeProposedText(proposedUserProfile, tradeRequest);`
`53`	`56`
`54`		`- await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber,`
	`57`	`+ await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber, department,`
`55`	`58`	`tradeRequest.SourceShiftSignup.Shift.Name, sourceUserProfile);`
`56`	`59`	`}`
`57`	`60`	`else if (sqi.Type == (int)ShiftQueueTypes.TradeFilled && !String.IsNullOrWhiteSpace(sqi.SourceUserId))`
`@@ -62,7 +65,7 @@ await _communicationService.SendNotificationAsync(sourceUserProfile.UserId, trad`
`62`	`65`
`63`	`66`	`var text = _shiftsService.GenerateShiftTradeFilledText(sourceUserProfile, tradeRequest);`
`64`	`67`
`65`		`- await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber,`
	`68`	`+ await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tradeRequest.SourceShiftSignup.Shift.DepartmentId, text, sqi.DepartmentNumber, department,`
`66`	`69`	`tradeRequest.SourceShiftSignup.Shift.Name, proposedUserProfile);`
`67`	`70`	`}`
`68`	`71`	`else if (sqi.Type == (int)ShiftQueueTypes.ShiftCreated)`
`@@ -74,7 +77,7 @@ await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tr`
`74`	`77`
`75`	`78`	`foreach (var profile in profiles.Select(x => x.Value))`
`76`	`79`	`{`
`77`		`- await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, "New Shift", profile);`
	`80`	`+ await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, "New Shift", profile);`
`78`	`81`	`}`
`79`	`82`	`}`
`80`	`83`	`else if (sqi.Type == (int)ShiftQueueTypes.ShiftUpdated)`
`@@ -87,9 +90,9 @@ await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tr`
`87`	`90`	`foreach (var profile in shift.Personnel)`
`88`	`91`	`{`
`89`	`92`	`if (profiles.ContainsKey(profile.UserId))`
`90`		`- await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, shift.Name, profiles[profile.UserId]);`
	`93`	`+ await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, shift.Name, profiles[profile.UserId]);`
`91`	`94`	`else`
`92`		`- await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, shift.Name);`
	`95`	`+ await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, shift.Name);`
`93`	`96`	`}`
`94`	`97`	`}`
`95`	`98`	`else if (sqi.Type == (int)ShiftQueueTypes.ShiftDaysAdded)`
`@@ -104,9 +107,9 @@ await _communicationService.SendNotificationAsync(proposedUserProfile.UserId, tr`
`104`	`107`	`foreach (var profile in shift.Personnel)`
`105`	`108`	`{`
`106`	`109`	`if (profiles.ContainsKey(profile.UserId))`
`107`		`- await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, shift.Name, profiles[profile.UserId]);`
	`110`	`+ await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, shift.Name, profiles[profile.UserId]);`
`108`	`111`	`else`
`109`		`- await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, shift.Name);`
	`112`	`+ await _communicationService.SendNotificationAsync(profile.UserId, sqi.DepartmentId, text, sqi.DepartmentNumber, department, shift.Name);`
`110`	`113`	`}`
`111`	`114`	`}`
`112`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,14 @@ public class ShiftNotifierLogic`
`14`	`14`	`private IShiftsService _shiftsService;`
`15`	`15`	`private ICommunicationService _communicationService;`
`16`	`16`	`private IDepartmentSettingsService _departmentSettingsService;`
	`17`	`+ private IDepartmentsService _departmentsService;`
`17`	`18`
`18`	`19`	`public ShiftNotifierLogic()`
`19`	`20`	`{`
`20`	`21`	`_shiftsService = Bootstrapper.GetKernel().Resolve<IShiftsService>();`
`21`	`22`	`_communicationService = Bootstrapper.GetKernel().Resolve<ICommunicationService>();`
`22`	`23`	`_departmentSettingsService = Bootstrapper.GetKernel().Resolve<IDepartmentSettingsService>();`
	`24`	`+ _departmentsService = Bootstrapper.GetKernel().Resolve<IDepartmentsService>();`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`public async Task<Tuple<bool, string>> Process(ShiftNotifierQueueItem item)`
`@@ -31,6 +33,7 @@ public async Task<Tuple<bool, string>> Process(ShiftNotifierQueueItem item)`
`31`	`33`	`{`
`32`	`34`	`var text = _shiftsService.GenerateShiftNotificationText(item.Shift);`
`33`	`35`	`string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(item.Shift.DepartmentId);`
	`36`	`+ var department = await _departmentsService.GetDepartmentByIdAsync(item.Shift.DepartmentId, false);`
`34`	`37`
`35`	`38`	`if (ConfigHelper.CanTransmit(item.Shift.DepartmentId))`
`36`	`39`	`{`
`@@ -39,7 +42,7 @@ public async Task<Tuple<bool, string>> Process(ShiftNotifierQueueItem item)`
`39`	`42`	`foreach (var person in item.Shift.Personnel)`
`40`	`43`	`{`
`41`	`44`	`UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == person.UserId);`
`42`		`- await _communicationService.SendNotificationAsync(person.UserId, item.Shift.DepartmentId, text, departmentNumber,`
	`45`	`+ await _communicationService.SendNotificationAsync(person.UserId, item.Shift.DepartmentId, text, departmentNumber, department,`
`43`	`46`	`item.Shift.Name, profile);`
`44`	`47`	`}`
`45`	`48`	`}`
`@@ -53,26 +56,26 @@ await _communicationService.SendNotificationAsync(person.UserId, item.Shift.Depa`
`53`	`56`	`if (!String.IsNullOrWhiteSpace(signup.Trade.UserId))`
`54`	`57`	`{`
`55`	`58`	`UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == signup.Trade.UserId);`
`56`		`- await _communicationService.SendNotificationAsync(signup.Trade.UserId, item.Shift.DepartmentId, text, departmentNumber,`
	`59`	`+ await _communicationService.SendNotificationAsync(signup.Trade.UserId, item.Shift.DepartmentId, text, departmentNumber, department,`
`57`	`60`	`item.Shift.Name, profile);`
`58`	`61`	`}`
`59`	`62`	`else if (signup.GetTradeType() == ShiftTradeTypes.Source)`
`60`	`63`	`{`
`61`	`64`	`UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == signup.Trade.TargetShiftSignup.UserId);`
`62`		`- await _communicationService.SendNotificationAsync(signup.Trade.TargetShiftSignup.UserId, item.Shift.DepartmentId, text, departmentNumber,`
	`65`	`+ await _communicationService.SendNotificationAsync(signup.Trade.TargetShiftSignup.UserId, item.Shift.DepartmentId, text, departmentNumber, department,`
`63`	`66`	`item.Shift.Name, profile);`
`64`	`67`	`}`
`65`	`68`	`else if (signup.GetTradeType() == ShiftTradeTypes.Target)`
`66`	`69`	`{`
`67`	`70`	`UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == signup.Trade.SourceShiftSignup.UserId);`
`68`		`- await _communicationService.SendNotificationAsync(signup.Trade.SourceShiftSignup.UserId, item.Shift.DepartmentId, text, departmentNumber,`
	`71`	`+ await _communicationService.SendNotificationAsync(signup.Trade.SourceShiftSignup.UserId, item.Shift.DepartmentId, text, departmentNumber, department,`
`69`	`72`	`item.Shift.Name, profile);`
`70`	`73`	`}`
`71`	`74`	`}`
`72`	`75`	`else`
`73`	`76`	`{`
`74`	`77`	`UserProfile profile = item.Profiles.FirstOrDefault(x => x.UserId == signup.UserId);`
`75`		`- await _communicationService.SendNotificationAsync(signup.UserId, item.Shift.DepartmentId, text, departmentNumber,`
	`78`	`+ await _communicationService.SendNotificationAsync(signup.UserId, item.Shift.DepartmentId, text, departmentNumber, department,`
`76`	`79`	`item.Shift.Name, profile);`
`77`	`80`	`}`
`78`	`81`	`}`