CU-8687aj3gt Adding Apns to Novu provider for Units #235
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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<System.Boolean>.</returns> | ||
| Task<bool> SendNotificationAsync(string userId, int departmentId, string message, string departmentNumber, Department department, | ||
| string title = "Notification", UserProfile profile = null); | ||
|
|
||
| /// <summary> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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, department, title, profiles[member.UserId]); | ||
| else | ||
| await _communicationService.SendNotificationAsync(member.UserId, calendarItem.DepartmentId, message, departmentNumber, department, title, null); | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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, 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 | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,16 @@ | ||
| using DnsClient; | ||
| using FirebaseAdmin.Messaging; | ||
| using Resgrid.Model; | ||
| using Resgrid.Model.Messages; | ||
| using Resgrid.Model.Providers; | ||
| using Resgrid.Model.Services; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Drawing; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Reflection; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Resgrid.Services | ||
| { | ||
|
|
@@ -36,31 +38,18 @@ public async Task<bool> Register(PushUri pushUri) | |
| if (pushUri == null || String.IsNullOrWhiteSpace(pushUri.DeviceId)) | ||
| return false; | ||
|
|
||
| var code = pushUri.PushLocation; | ||
|
|
||
| // 1) iOS -> APNS | ||
| if (pushUri.PlatformType == (int)Platforms.iOS) | ||
| return await _novuProvider.UpdateUserSubscriberApns(pushUri.UserId, code, pushUri.DeviceId); | ||
|
|
||
| // 2) Android -> FCM | ||
| if (pushUri.PlatformType == (int)Platforms.Android) | ||
| return await _novuProvider.UpdateUserSubscriberFcm(pushUri.UserId, code, pushUri.DeviceId); | ||
|
|
||
| // 3) TODO: Web Push (other platforms) | ||
| return false; | ||
| } | ||
|
|
||
| public async Task<bool> UnRegister(PushUri pushUri) | ||
|
|
@@ -72,29 +61,22 @@ public async Task<bool> UnRegister(PushUri pushUri) | |
|
|
||
| public async Task<bool> RegisterUnit(PushUri pushUri) | ||
| { | ||
| if (pushUri == null || !pushUri.UnitId.HasValue || string.IsNullOrWhiteSpace(pushUri.PushLocation)) | ||
| return false; | ||
|
|
||
| var unitId = pushUri.UnitId.Value; | ||
| var code = pushUri.PushLocation; | ||
|
|
||
| // 1) iOS -> APNS | ||
| if (pushUri.PlatformType == (int)Platforms.iOS) | ||
| return await _novuProvider.UpdateUnitSubscriberApns(unitId, code, pushUri.DeviceId); | ||
|
|
||
| // 2) Android -> FCM | ||
| if (pushUri.PlatformType == (int)Platforms.Android) | ||
| return await _novuProvider.UpdateUnitSubscriberFcm(unitId, code, pushUri.DeviceId); | ||
|
|
||
| // 3) TODO: Web Push (other platforms) | ||
| return false; | ||
| } | ||
|
|
||
| public async Task<bool> UnRegisterUnit(PushUri pushUri) | ||
|
|
@@ -118,7 +100,25 @@ public async Task<bool> PushMessage(StandardPushMessage message, string userId, | |
| profile = await _userProfileService.GetProfileByUserIdAsync(userId); | ||
|
|
||
| if (profile != null && profile.SendMessagePush) | ||
| { | ||
| try | ||
| { | ||
| await _notificationProvider.SendAllNotifications(message.Title, message.SubTitle, userId, string.Format("M{0}", message.MessageId), ((int)PushSoundTypes.Message).ToString(), true, 1, "#000000"); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Framework.Logging.LogException(ex); | ||
| } | ||
|
|
||
| try | ||
| { | ||
| await _novuProvider.SendUserMessage(message.Title, message.SubTitle, userId, message.DepartmentCode, string.Format("M{0}", message.MessageId), null); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Framework.Logging.LogException(ex); | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
@@ -132,8 +132,24 @@ public async Task<bool> PushNotification(StandardPushMessage message, string use | |
| profile = await _userProfileService.GetProfileByUserIdAsync(userId); | ||
|
|
||
| if (profile != null && profile.SendNotificationPush) | ||
| { | ||
| try | ||
| { | ||
| await _notificationProvider.SendAllNotifications(message.Title, message.SubTitle, userId, string.Format("N{0}", message.MessageId), ((int)PushSoundTypes.Notifiation).ToString(), true, 1, "#000000"); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Framework.Logging.LogException(ex); | ||
| } | ||
| try | ||
| { | ||
| await _novuProvider.SendUserMessage(message.Title, message.SubTitle, userId, message.DepartmentCode, string.Format("N{0}", message.MessageId), null); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Framework.Logging.LogException(ex); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
|
|
@@ -167,7 +183,26 @@ public async Task<bool> PushCall(StandardPushCall call, string userId, UserProfi | |
| color = priority.Color; | ||
|
|
||
| if (profile != null && profile.SendPush) | ||
| { | ||
| // Legacy Push Notifications (Azure) | ||
| try | ||
| { | ||
| await _notificationProvider.SendAllNotifications(call.SubTitle, call.Title, userId, string.Format("C{0}", call.CallId), ConvertCallPriorityToSound((int)call.Priority, priority), true, call.ActiveCallCount, color); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Framework.Logging.LogException(ex); | ||
| } | ||
|
|
||
| try | ||
| { | ||
| await _novuProvider.SendUserDispatch(call.Title, call.SubTitle, userId, call.DepartmentCode, string.Format("C{0}", call.CallId), ConvertCallPriorityToSound((int)call.Priority, priority), true, call.ActiveCallCount, color); | ||
|
Contributor
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainVerify DepartmentCode is populated in StandardPushCall The code passes 🏁 Script executed: #!/bin/bash
# Check StandardPushCall definition and usage to verify DepartmentCode is always set
ast-grep --pattern 'class StandardPushCall {
$$$
public string DepartmentCode { $$$; set; }
$$$
}'
# Check where StandardPushCall is instantiated
rg -A 5 "new StandardPushCall"Length of output: 1586 StandardPushCall.DepartmentCode is never set In Please update each instantiation in // existing assignment
spc.DepartmentId = departmentId;
+ spc.DepartmentCode = departmentCode; // ensure DepartmentCode is populatedAffected locations (3 occurrences of
🤖 Prompt for AI Agents |
||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Framework.Logging.LogException(ex); | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
@@ -184,15 +219,6 @@ public async Task<bool> PushCallUnit(StandardPushCall call, int unitId, Departme | |
| if (priority != null) | ||
| color = priority.Color; | ||
|
|
||
| try | ||
| { | ||
| await _novuProvider.SendUnitDispatch(call.Title, call.SubTitle, unitId, call.DepartmentCode, string.Format("C{0}", call.CallId), ConvertCallPriorityToSound((int)call.Priority, priority), true, call.ActiveCallCount, color); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Breaking enum value changes will corrupt persisted platform mappings and conflict with hard-coded checks
Previous code (and likely persisted DB values) use 1=iPad, 2=iPhone, 3=Android, 4=Windows8. This change sets iOS=1, Android=2, Web=3, which:
Preserve legacy numeric values and introduce new names without reassigning existing numbers. Optionally re-add legacy members marked [Obsolete] for compatibility.
Apply this diff to restore stable values and keep compatibility:
If changing enum assignments is not feasible now, introduce centralized helpers to interpret legacy ints consistently and update UI/provider code to use them.
📝 Committable suggestion
🤖 Prompt for AI Agents