RE1-T115 PR#362 fixes

Author: ucswift

Core/Resgrid.Services/WeatherAlertService.cs

@@ -21,7 +21,7 @@ public class WeatherAlertService : IWeatherAlertService
 		private readonly IWeatherAlertProviderFactory _weatherAlertProviderFactory;
 		private readonly IDepartmentSettingsRepository _departmentSettingsRepository;
 		private readonly IDepartmentsService _departmentsService;
-		private readonly IMessageService _messageService;
+		private readonly ICommunicationService _communicationService;
 		private readonly ICallNotesRepository _callNotesRepository;
 		private readonly ICacheProvider _cacheProvider;
 		private readonly IEventAggregator _eventAggregator;
@@ -33,7 +33,7 @@ public WeatherAlertService(
 			IWeatherAlertProviderFactory weatherAlertProviderFactory,
 			IDepartmentSettingsRepository departmentSettingsRepository,
 			IDepartmentsService departmentsService,
-			IMessageService messageService,
+			ICommunicationService communicationService,
 			ICallNotesRepository callNotesRepository,
 			ICacheProvider cacheProvider,
 			IEventAggregator eventAggregator)
@@ -44,7 +44,7 @@ public WeatherAlertService(
 			_weatherAlertProviderFactory = weatherAlertProviderFactory;
 			_departmentSettingsRepository = departmentSettingsRepository;
 			_departmentsService = departmentsService;
-			_messageService = messageService;
+			_communicationService = communicationService;
 			_callNotesRepository = callNotesRepository;
 			_cacheProvider = cacheProvider;
 			_eventAggregator = eventAggregator;
@@ -381,33 +381,31 @@ public async Task SendPendingNotificationsAsync(CancellationToken ct = default)
 							var members = await _departmentsService.GetAllMembersForDepartmentAsync(departmentId);
 							if (members != null && members.Any())
 							{
-								// Use department managing user as sender for system messages
+								// Use department managing user as sender for notifications
 								var senderId = department?.ManagingUserId ?? members.First().UserId;
 
 								var subject = FormatAlertSubject(alert);
 								var body = FormatAlertMessageBody(alert, department);
 
-								var message = new Message
-								{
-									Subject = subject,
-									Body = body,
-									SendingUserId = senderId,
-									SentOn = DateTime.UtcNow,
-									SystemGenerated = true,
-									IsBroadcast = true,
-									Type = 0
-								};
-
 								foreach (var member in members)
 								{
-									if (member.UserId != senderId && !member.IsDisabled.GetValueOrDefault() && !member.IsDeleted)
-										message.AddRecipient(member.UserId);
+									if (member.UserId == senderId || member.IsDisabled.GetValueOrDefault() || member.IsDeleted)
+										continue;
+
+									var notifyMsg = new Message
+									{
+										Subject = subject,
+										Body = body,
+										SendingUserId = senderId,
+										ReceivingUserId = member.UserId,
+										SentOn = DateTime.UtcNow,
+										SystemGenerated = true,
+										IsBroadcast = true,
+										Type = 0
+									};
+
+									await _communicationService.SendMessageAsync(notifyMsg, "Weather Alert System", null, departmentId, null, department);
 								}
-
-								var savedMessage = await _messageService.SaveMessageAsync(message, ct);
-								await _messageService.SendMessageAsync(savedMessage, "Weather Alert System", departmentId, false, ct);
-
-								alert.SystemMessageId = savedMessage.MessageId;
 							}
 						}
 						catch (Exception ex)

Tests/Resgrid.Tests/Models/TimeZoneTests.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using FluentAssertions;
 using NUnit.Framework;
 using Resgrid.Model;
@@ -11,6 +12,8 @@ public class TimeZoneTests
 		[Test]
 		public void TestAllTimeZones()
 		{
+			var unresolvedZones = new List<string>();
+
 			foreach (var timeZone in TimeZones.Zones)
 			{
 				try
@@ -20,11 +23,37 @@ public void TestAllTimeZones()
 				}
 				catch (TimeZoneNotFoundException)
 				{
-					// Windows timezone IDs are not available on non-Windows platforms (Linux/macOS use IANA IDs).
-					// Skip entries that are not found on the current OS rather than failing the test.
-					Assert.Ignore($"Timezone '{timeZone.Key}' is not available on this platform; skipping.");
+					// On non-Windows platforms, Windows timezone IDs are not available.
+					// Try converting to IANA ID first, then attempt lookup.
+					if (TimeZoneInfo.TryConvertWindowsIdToIanaId(timeZone.Key, out string ianaId))
+					{
+						try
+						{
+							var timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(ianaId);
+							timeZoneInfo.Should().NotBeNull();
+							continue;
+						}
+						catch (TimeZoneNotFoundException)
+						{
+							// IANA ID also not found on this platform
+						}
+					}
+
+					unresolvedZones.Add(timeZone.Key);
 				}
 			}
+
+			// Report any unresolvable zones but don't fail the test;
+			// some Windows-specific timezone IDs don't exist on all platforms.
+			if (unresolvedZones.Count > 0)
+			{
+				TestContext.WriteLine(
+					$"The following {unresolvedZones.Count} timezone(s) could not be resolved on this platform: " +
+					string.Join(", ", unresolvedZones));
+			}
+
+			// The test passes as long as it didn't crash; unresolvable zones
+			// are expected on non-Windows platforms for Windows-only IDs.
 		}
 	}
 }