From 7b4122c8379df5444e839297b4e7f9163550861a Mon Sep 17 00:00:00 2001 From: Maciej Zieniuk Date: Tue, 26 Nov 2024 19:08:34 +0000 Subject: [PATCH] PM-15084: Consistent notification center push type names. Renamed PushType's `SyncNotification` to `Notification`, since the push type payload does not require, is not dependent on the sync mechanism. --- src/Core/Enums/PushType.cs | 4 +- .../NotificationHubPushNotificationService.cs | 12 ++-- .../AzureQueuePushNotificationService.cs | 4 +- ...NotificationsApiPushNotificationService.cs | 4 +- .../RelayPushNotificationService.cs | 12 ++-- src/Notifications/HubHelpers.cs | 33 +++++---- .../Controllers/PushControllerTests.cs | 18 ++--- ...ficationHubPushNotificationServiceTests.cs | 68 +++++++++---------- .../AzureQueuePushNotificationServiceTests.cs | 8 +-- 9 files changed, 81 insertions(+), 82 deletions(-) diff --git a/src/Core/Enums/PushType.cs b/src/Core/Enums/PushType.cs index 541e2cd072..2a4c7a0342 100644 --- a/src/Core/Enums/PushType.cs +++ b/src/Core/Enums/PushType.cs @@ -26,6 +26,6 @@ public enum PushType : byte SyncOrganizations = 17, - SyncNotification = 18, - SyncNotificationStatus = 19 + Notification = 18, + NotificationStatus = 19 } diff --git a/src/Core/NotificationHub/NotificationHubPushNotificationService.cs b/src/Core/NotificationHub/NotificationHubPushNotificationService.cs index 7723551ed6..faee16c07a 100644 --- a/src/Core/NotificationHub/NotificationHubPushNotificationService.cs +++ b/src/Core/NotificationHub/NotificationHubPushNotificationService.cs @@ -214,17 +214,17 @@ public class NotificationHubPushNotificationService : IPushNotificationService if (notification.Global && installationId.HasValue) { - await SendPayloadToInstallationAsync(installationId.Value, PushType.SyncNotification, message, true, + await SendPayloadToInstallationAsync(installationId.Value, PushType.Notification, message, true, notification.ClientType); } else if (notification.UserId.HasValue) { - await SendPayloadToUserAsync(notification.UserId.Value, PushType.SyncNotification, message, true, + await SendPayloadToUserAsync(notification.UserId.Value, PushType.Notification, message, true, notification.ClientType); } else if (notification.OrganizationId.HasValue) { - await SendPayloadToOrganizationAsync(notification.OrganizationId.Value, PushType.SyncNotification, message, + await SendPayloadToOrganizationAsync(notification.OrganizationId.Value, PushType.Notification, message, true, notification.ClientType); } } @@ -254,17 +254,17 @@ public class NotificationHubPushNotificationService : IPushNotificationService if (notification.Global && installationId.HasValue) { - await SendPayloadToInstallationAsync(installationId.Value, PushType.SyncNotificationStatus, message, true, + await SendPayloadToInstallationAsync(installationId.Value, PushType.NotificationStatus, message, true, notification.ClientType); } else if (notification.UserId.HasValue) { - await SendPayloadToUserAsync(notification.UserId.Value, PushType.SyncNotificationStatus, message, true, + await SendPayloadToUserAsync(notification.UserId.Value, PushType.NotificationStatus, message, true, notification.ClientType); } else if (notification.OrganizationId.HasValue) { - await SendPayloadToOrganizationAsync(notification.OrganizationId.Value, PushType.SyncNotificationStatus, + await SendPayloadToOrganizationAsync(notification.OrganizationId.Value, PushType.NotificationStatus, message, true, notification.ClientType); } } diff --git a/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs b/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs index e6d443d213..991cfec70c 100644 --- a/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs +++ b/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs @@ -186,7 +186,7 @@ public class AzureQueuePushNotificationService : IPushNotificationService RevisionDate = notification.RevisionDate }; - await SendMessageAsync(PushType.SyncNotification, message, true); + await SendMessageAsync(PushType.Notification, message, true); } public async Task PushNotificationStatusAsync(Notification notification, NotificationStatus notificationStatus) @@ -208,7 +208,7 @@ public class AzureQueuePushNotificationService : IPushNotificationService DeletedDate = notificationStatus.DeletedDate }; - await SendMessageAsync(PushType.SyncNotificationStatus, message, true); + await SendMessageAsync(PushType.NotificationStatus, message, true); } private async Task PushSendAsync(Send send, PushType type) diff --git a/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs b/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs index 3b7c15bac0..39c0e5141a 100644 --- a/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs +++ b/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs @@ -196,7 +196,7 @@ public class NotificationsApiPushNotificationService : BaseIdentityClientService RevisionDate = notification.RevisionDate }; - await SendMessageAsync(PushType.SyncNotification, message, true); + await SendMessageAsync(PushType.Notification, message, true); } public async Task PushNotificationStatusAsync(Notification notification, NotificationStatus notificationStatus) @@ -218,7 +218,7 @@ public class NotificationsApiPushNotificationService : BaseIdentityClientService DeletedDate = notificationStatus.DeletedDate }; - await SendMessageAsync(PushType.SyncNotificationStatus, message, true); + await SendMessageAsync(PushType.NotificationStatus, message, true); } private async Task PushSendAsync(Send send, PushType type) diff --git a/src/Core/Services/Implementations/RelayPushNotificationService.cs b/src/Core/Services/Implementations/RelayPushNotificationService.cs index 5de5604569..d83fae2010 100644 --- a/src/Core/Services/Implementations/RelayPushNotificationService.cs +++ b/src/Core/Services/Implementations/RelayPushNotificationService.cs @@ -216,17 +216,17 @@ public class RelayPushNotificationService : BaseIdentityClientService, IPushNoti if (notification.Global) { - await SendPayloadToInstallationAsync(PushType.SyncNotification, message, true, + await SendPayloadToInstallationAsync(PushType.Notification, message, true, notification.ClientType); } else if (notification.UserId.HasValue) { - await SendPayloadToUserAsync(notification.UserId.Value, PushType.SyncNotification, message, true, + await SendPayloadToUserAsync(notification.UserId.Value, PushType.Notification, message, true, notification.ClientType); } else if (notification.OrganizationId.HasValue) { - await SendPayloadToOrganizationAsync(notification.OrganizationId.Value, PushType.SyncNotification, message, + await SendPayloadToOrganizationAsync(notification.OrganizationId.Value, PushType.Notification, message, true, notification.ClientType); } } @@ -252,17 +252,17 @@ public class RelayPushNotificationService : BaseIdentityClientService, IPushNoti if (notification.Global) { - await SendPayloadToInstallationAsync(PushType.SyncNotificationStatus, message, true, + await SendPayloadToInstallationAsync(PushType.NotificationStatus, message, true, notification.ClientType); } else if (notification.UserId.HasValue) { - await SendPayloadToUserAsync(notification.UserId.Value, PushType.SyncNotificationStatus, message, true, + await SendPayloadToUserAsync(notification.UserId.Value, PushType.NotificationStatus, message, true, notification.ClientType); } else if (notification.OrganizationId.HasValue) { - await SendPayloadToOrganizationAsync(notification.OrganizationId.Value, PushType.SyncNotificationStatus, + await SendPayloadToOrganizationAsync(notification.OrganizationId.Value, PushType.NotificationStatus, message, true, notification.ClientType); } } diff --git a/src/Notifications/HubHelpers.cs b/src/Notifications/HubHelpers.cs index 8f1666fdf5..691f454546 100644 --- a/src/Notifications/HubHelpers.cs +++ b/src/Notifications/HubHelpers.cs @@ -89,36 +89,35 @@ public static class HubHelpers await hubContext.Clients.User(authRequestNotification.Payload.UserId.ToString()) .SendAsync(_receiveMessageMethod, authRequestNotification, cancellationToken); break; - case PushType.SyncNotification: - case PushType.SyncNotificationStatus: - var syncNotification = - JsonSerializer.Deserialize>( - notificationJson, _deserializerOptions); - if (syncNotification.Payload.InstallationId.HasValue) + case PushType.Notification: + case PushType.NotificationStatus: + var notificationData = JsonSerializer.Deserialize>( + notificationJson, _deserializerOptions); + if (notificationData.Payload.InstallationId.HasValue) { await hubContext.Clients.Group(NotificationsHub.GetInstallationGroup( - syncNotification.Payload.InstallationId.Value, syncNotification.Payload.ClientType)) - .SendAsync(_receiveMessageMethod, syncNotification, cancellationToken); + notificationData.Payload.InstallationId.Value, notificationData.Payload.ClientType)) + .SendAsync(_receiveMessageMethod, notificationData, cancellationToken); } - else if (syncNotification.Payload.UserId.HasValue) + else if (notificationData.Payload.UserId.HasValue) { - if (syncNotification.Payload.ClientType == ClientType.All) + if (notificationData.Payload.ClientType == ClientType.All) { - await hubContext.Clients.User(syncNotification.Payload.UserId.ToString()) - .SendAsync(_receiveMessageMethod, syncNotification, cancellationToken); + await hubContext.Clients.User(notificationData.Payload.UserId.ToString()) + .SendAsync(_receiveMessageMethod, notificationData, cancellationToken); } else { await hubContext.Clients.Group(NotificationsHub.GetUserGroup( - syncNotification.Payload.UserId.Value, syncNotification.Payload.ClientType)) - .SendAsync(_receiveMessageMethod, syncNotification, cancellationToken); + notificationData.Payload.UserId.Value, notificationData.Payload.ClientType)) + .SendAsync(_receiveMessageMethod, notificationData, cancellationToken); } } - else if (syncNotification.Payload.OrganizationId.HasValue) + else if (notificationData.Payload.OrganizationId.HasValue) { await hubContext.Clients.Group(NotificationsHub.GetOrganizationGroup( - syncNotification.Payload.OrganizationId.Value, syncNotification.Payload.ClientType)) - .SendAsync(_receiveMessageMethod, syncNotification, cancellationToken); + notificationData.Payload.OrganizationId.Value, notificationData.Payload.ClientType)) + .SendAsync(_receiveMessageMethod, notificationData, cancellationToken); } break; diff --git a/test/Api.Test/Controllers/PushControllerTests.cs b/test/Api.Test/Controllers/PushControllerTests.cs index 1dc5c833dd..5cc5845e44 100644 --- a/test/Api.Test/Controllers/PushControllerTests.cs +++ b/test/Api.Test/Controllers/PushControllerTests.cs @@ -33,7 +33,7 @@ public class PushControllerTests var exception = await Assert.ThrowsAsync(() => sutProvider.Sut.SendAsync(new PushSendRequestModel { - Type = PushType.SyncNotification, + Type = PushType.Notification, UserId = userId.ToString(), OrganizationId = organizationId.ToString(), InstallationId = installationId.ToString(), @@ -63,7 +63,7 @@ public class PushControllerTests await sutProvider.Sut.SendAsync(new PushSendRequestModel { - Type = PushType.SyncNotification, + Type = PushType.Notification, UserId = null, OrganizationId = null, InstallationId = null, @@ -96,7 +96,7 @@ public class PushControllerTests await sutProvider.Sut.SendAsync(new PushSendRequestModel { - Type = PushType.SyncNotification, + Type = PushType.Notification, UserId = userId.ToString(), OrganizationId = haveOrganizationId ? Guid.NewGuid().ToString() : null, InstallationId = null, @@ -107,7 +107,7 @@ public class PushControllerTests }); await sutProvider.GetDependency().Received(1) - .SendPayloadToUserAsync(expectedUserId, PushType.SyncNotification, "test-payload", expectedIdentifier, + .SendPayloadToUserAsync(expectedUserId, PushType.Notification, "test-payload", expectedIdentifier, expectedDeviceId, ClientType.All); await sutProvider.GetDependency().Received(0) .SendPayloadToOrganizationAsync(Arg.Any(), Arg.Any(), Arg.Any(), @@ -132,7 +132,7 @@ public class PushControllerTests await sutProvider.Sut.SendAsync(new PushSendRequestModel { - Type = PushType.SyncNotification, + Type = PushType.Notification, UserId = null, OrganizationId = organizationId.ToString(), InstallationId = null, @@ -143,7 +143,7 @@ public class PushControllerTests }); await sutProvider.GetDependency().Received(1) - .SendPayloadToOrganizationAsync(expectedOrganizationId, PushType.SyncNotification, "test-payload", + .SendPayloadToOrganizationAsync(expectedOrganizationId, PushType.Notification, "test-payload", expectedIdentifier, expectedDeviceId, ClientType.All); await sutProvider.GetDependency().Received(0) .SendPayloadToUserAsync(Arg.Any(), Arg.Any(), Arg.Any(), Arg.Any(), @@ -166,7 +166,7 @@ public class PushControllerTests await sutProvider.Sut.SendAsync(new PushSendRequestModel { - Type = PushType.SyncNotification, + Type = PushType.Notification, UserId = null, OrganizationId = null, InstallationId = installationId.ToString(), @@ -177,7 +177,7 @@ public class PushControllerTests }); await sutProvider.GetDependency().Received(1) - .SendPayloadToInstallationAsync(installationId.ToString(), PushType.SyncNotification, "test-payload", + .SendPayloadToInstallationAsync(installationId.ToString(), PushType.Notification, "test-payload", expectedIdentifier, expectedDeviceId, ClientType.All); await sutProvider.GetDependency().Received(0) .SendPayloadToOrganizationAsync(Arg.Any(), Arg.Any(), Arg.Any(), @@ -198,7 +198,7 @@ public class PushControllerTests var exception = await Assert.ThrowsAsync(() => sutProvider.Sut.SendAsync(new PushSendRequestModel { - Type = PushType.SyncNotification, + Type = PushType.Notification, UserId = null, OrganizationId = null, InstallationId = Guid.NewGuid().ToString(), diff --git a/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs b/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs index 7ed5712db4..831d048224 100644 --- a/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs +++ b/test/Core.Test/NotificationHub/NotificationHubPushNotificationServiceTests.cs @@ -47,12 +47,12 @@ public class NotificationHubPushNotificationServiceTests { sutProvider.GetDependency().Installation.Id = installationId; notification.ClientType = ClientType.All; - var expectedSyncNotification = ToNotificationPushNotification(notification, null, installationId); + var expectedNotification = ToNotificationPushNotification(notification, null, installationId); await sutProvider.Sut.PushNotificationAsync(notification); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotification, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification, + expectedNotification, $"(template:payload && installationId:{installationId})"); await sutProvider.GetDependency() .Received(0) @@ -71,12 +71,12 @@ public class NotificationHubPushNotificationServiceTests { sutProvider.GetDependency().Installation.Id = installationId; notification.ClientType = clientType; - var expectedSyncNotification = ToNotificationPushNotification(notification, null, installationId); + var expectedNotification = ToNotificationPushNotification(notification, null, installationId); await sutProvider.Sut.PushNotificationAsync(notification); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotification, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification, + expectedNotification, $"(template:payload && installationId:{installationId} && clientType:{clientType})"); await sutProvider.GetDependency() .Received(0) @@ -97,12 +97,12 @@ public class NotificationHubPushNotificationServiceTests } notification.ClientType = ClientType.All; - var expectedSyncNotification = ToNotificationPushNotification(notification, null, null); + var expectedNotification = ToNotificationPushNotification(notification, null, null); await sutProvider.Sut.PushNotificationAsync(notification); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotification, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification, + expectedNotification, $"(template:payload_userId:{notification.UserId})"); await sutProvider.GetDependency() .Received(0) @@ -121,12 +121,12 @@ public class NotificationHubPushNotificationServiceTests { notification.OrganizationId = null; notification.ClientType = clientType; - var expectedSyncNotification = ToNotificationPushNotification(notification, null, null); + var expectedNotification = ToNotificationPushNotification(notification, null, null); await sutProvider.Sut.PushNotificationAsync(notification); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotification, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification, + expectedNotification, $"(template:payload_userId:{notification.UserId} && clientType:{clientType})"); await sutProvider.GetDependency() .Received(0) @@ -144,12 +144,12 @@ public class NotificationHubPushNotificationServiceTests Notification notification) { notification.ClientType = clientType; - var expectedSyncNotification = ToNotificationPushNotification(notification, null, null); + var expectedNotification = ToNotificationPushNotification(notification, null, null); await sutProvider.Sut.PushNotificationAsync(notification); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotification, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification, + expectedNotification, $"(template:payload_userId:{notification.UserId} && clientType:{clientType})"); await sutProvider.GetDependency() .Received(0) @@ -164,12 +164,12 @@ public class NotificationHubPushNotificationServiceTests { notification.UserId = null; notification.ClientType = ClientType.All; - var expectedSyncNotification = ToNotificationPushNotification(notification, null, null); + var expectedNotification = ToNotificationPushNotification(notification, null, null); await sutProvider.Sut.PushNotificationAsync(notification); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotification, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification, + expectedNotification, $"(template:payload && organizationId:{notification.OrganizationId})"); await sutProvider.GetDependency() .Received(0) @@ -188,12 +188,12 @@ public class NotificationHubPushNotificationServiceTests { notification.UserId = null; notification.ClientType = clientType; - var expectedSyncNotification = ToNotificationPushNotification(notification, null, null); + var expectedNotification = ToNotificationPushNotification(notification, null, null); await sutProvider.Sut.PushNotificationAsync(notification); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotification, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.Notification, + expectedNotification, $"(template:payload && organizationId:{notification.OrganizationId} && clientType:{clientType})"); await sutProvider.GetDependency() .Received(0) @@ -231,12 +231,12 @@ public class NotificationHubPushNotificationServiceTests sutProvider.GetDependency().Installation.Id = installationId; notification.ClientType = ClientType.All; - var expectedSyncNotification = ToNotificationPushNotification(notification, notificationStatus, installationId); + var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, installationId); await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotificationStatus, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus, + expectedNotification, $"(template:payload && installationId:{installationId})"); await sutProvider.GetDependency() .Received(0) @@ -257,12 +257,12 @@ public class NotificationHubPushNotificationServiceTests sutProvider.GetDependency().Installation.Id = installationId; notification.ClientType = clientType; - var expectedSyncNotification = ToNotificationPushNotification(notification, notificationStatus, installationId); + var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, installationId); await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotificationStatus, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus, + expectedNotification, $"(template:payload && installationId:{installationId} && clientType:{clientType})"); await sutProvider.GetDependency() .Received(0) @@ -283,12 +283,12 @@ public class NotificationHubPushNotificationServiceTests } notification.ClientType = ClientType.All; - var expectedSyncNotification = ToNotificationPushNotification(notification, notificationStatus, null); + var expectedNotification = ToNotificationPushNotification(notification, notificationStatus, null); await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotificationStatus, - expectedSyncNotification, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus, + expectedNotification, $"(template:payload_userId:{notification.UserId})"); await sutProvider.GetDependency() .Received(0) @@ -311,7 +311,7 @@ public class NotificationHubPushNotificationServiceTests await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotificationStatus, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus, expectedNotification, $"(template:payload_userId:{notification.UserId} && clientType:{clientType})"); await sutProvider.GetDependency() @@ -334,7 +334,7 @@ public class NotificationHubPushNotificationServiceTests await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotificationStatus, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus, expectedNotification, $"(template:payload_userId:{notification.UserId} && clientType:{clientType})"); await sutProvider.GetDependency() @@ -355,7 +355,7 @@ public class NotificationHubPushNotificationServiceTests await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotificationStatus, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus, expectedNotification, $"(template:payload && organizationId:{notification.OrganizationId})"); await sutProvider.GetDependency() @@ -380,7 +380,7 @@ public class NotificationHubPushNotificationServiceTests await sutProvider.Sut.PushNotificationStatusAsync(notification, notificationStatus); - await AssertSendTemplateNotificationAsync(sutProvider, PushType.SyncNotificationStatus, + await AssertSendTemplateNotificationAsync(sutProvider, PushType.NotificationStatus, expectedNotification, $"(template:payload && organizationId:{notification.OrganizationId} && clientType:{clientType})"); await sutProvider.GetDependency() diff --git a/test/Core.Test/Services/AzureQueuePushNotificationServiceTests.cs b/test/Core.Test/Services/AzureQueuePushNotificationServiceTests.cs index 5128cf530e..38855b3c01 100644 --- a/test/Core.Test/Services/AzureQueuePushNotificationServiceTests.cs +++ b/test/Core.Test/Services/AzureQueuePushNotificationServiceTests.cs @@ -39,7 +39,7 @@ public class AzureQueuePushNotificationServiceTests await sutProvider.GetDependency().Received(1) .SendMessageAsync(Arg.Is(message => - MatchMessage(PushType.SyncNotification, message, + MatchMessage(PushType.Notification, message, new NotificationPushNotificationEquals(notification, null, installationId), deviceIdentifier.ToString()))); } @@ -61,7 +61,7 @@ public class AzureQueuePushNotificationServiceTests await sutProvider.GetDependency().Received(1) .SendMessageAsync(Arg.Is(message => - MatchMessage(PushType.SyncNotification, message, + MatchMessage(PushType.Notification, message, new NotificationPushNotificationEquals(notification, null, null), deviceIdentifier.ToString()))); } @@ -84,7 +84,7 @@ public class AzureQueuePushNotificationServiceTests await sutProvider.GetDependency().Received(1) .SendMessageAsync(Arg.Is(message => - MatchMessage(PushType.SyncNotificationStatus, message, + MatchMessage(PushType.NotificationStatus, message, new NotificationPushNotificationEquals(notification, notificationStatus, installationId), deviceIdentifier.ToString()))); } @@ -107,7 +107,7 @@ public class AzureQueuePushNotificationServiceTests await sutProvider.GetDependency().Received(1) .SendMessageAsync(Arg.Is(message => - MatchMessage(PushType.SyncNotificationStatus, message, + MatchMessage(PushType.NotificationStatus, message, new NotificationPushNotificationEquals(notification, notificationStatus, null), deviceIdentifier.ToString()))); }