diff --git a/src/Blauhaus.Push.Runner/Blauhaus.Push.Runner.csproj b/src/Blauhaus.Push.Runner/Blauhaus.Push.Runner.csproj index b6acd04..7be17d9 100644 --- a/src/Blauhaus.Push.Runner/Blauhaus.Push.Runner.csproj +++ b/src/Blauhaus.Push.Runner/Blauhaus.Push.Runner.csproj @@ -7,6 +7,7 @@ + diff --git a/src/Blauhaus.Push.Runner/Config/MobileJackpotHub.cs b/src/Blauhaus.Push.Runner/Config/MobileJackpotHub.cs new file mode 100644 index 0000000..24e7deb --- /dev/null +++ b/src/Blauhaus.Push.Runner/Config/MobileJackpotHub.cs @@ -0,0 +1,16 @@ +using Blauhaus.Common.ValueObjects.RuntimePlatforms; + +namespace Blauhaus.Push.Runner.Config; + +public class MobileJackpotHub : BasePushRunnerHub +{ + public MobileJackpotHub() : base( + platform: RuntimePlatform.Android, + pnsHandle: "d3qJ5-2cTM-sUG9NfZe-vx:APA91bHjU0niuFut_DwnY2sdFaYhJkdyUHsTR8VHjC9rqFg2UPgusOgWahH4WAbS-xtPXSxk8ImTjhaXOKTNaaVyfc3luqnaeqcRvAVq2MesBSGN8N9AxxlQetPGL-0GCbK7WyIXLfX0", + deviceId: "1bc0bb0585a648e4", + userId: "653") + { + NotificationHubConnectionString = "Endpoint=sb://mobile-jackpot-namespace.servicebus.windows.net/;SharedAccessKeyName=DefaultFullSharedAccessSignature;SharedAccessKey=FgAFw3Mg1aEgTX8vItdZizTg/qXnO+JN6ajcbeIX7VA="; + NotificationHubName = "mobile-jackpot-notifications"; + } +} \ No newline at end of file diff --git a/src/Blauhaus.Push.Runner/Config/Reveye/AspersHub.cs b/src/Blauhaus.Push.Runner/Config/Reveye/AspersHub.cs index fbcc32b..b7896f7 100644 --- a/src/Blauhaus.Push.Runner/Config/Reveye/AspersHub.cs +++ b/src/Blauhaus.Push.Runner/Config/Reveye/AspersHub.cs @@ -13,6 +13,7 @@ protected BaseAspersHub(IRuntimePlatform platform, string pnsHandle, string devi "SharedAccessKey=mk4xOnfkwdbOAZ7CvAyAX0FwgOTm8TJFisEhj6hdhOE=";//";" + //"EntityPath=reveye-push-aspers"; + NotificationHubName = "reveye-push-aspers"; } } diff --git a/src/Blauhaus.Push.Runner/Program.cs b/src/Blauhaus.Push.Runner/Program.cs index d40bdbc..2743d6d 100644 --- a/src/Blauhaus.Push.Runner/Program.cs +++ b/src/Blauhaus.Push.Runner/Program.cs @@ -20,6 +20,7 @@ using Blauhaus.Push.Server.Ioc; using Microsoft.Azure.NotificationHubs; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace Blauhaus.Push.Runner { @@ -42,10 +43,10 @@ private static async Task Main(string[] args) { try { - var hub = new LumenDevelopmentAndroidHub(); + var hub = new MobileJackpotHub(); _pushNotificationsService = Setup(hub); var reg = await GetAllRegistrationsAsync(); - + var registrationForUserDevice = await _pushNotificationsService.LoadRegistrationForUserDeviceAsync(hub.UserId, hub.DeviceId, hub); if (registrationForUserDevice.IsSuccess && registrationForUserDevice.Value.Templates.Any()) @@ -77,9 +78,10 @@ await _pushNotificationsService.SendNotificationToUserDeviceAsync( private static IPushNotificationsServerService Setup(BasePushRunnerHub hub) { var services = new ServiceCollection(); - + services.AddSingleton(BuildConfig.Debug); services.AddSingleton(typeof(IAnalyticsLogger<>), typeof(DummyLogger<>)); + services.AddSingleton(typeof(ILogger<>), typeof(DummyLogger<>)); services.AddPushNotificationsServer(); diff --git a/src/Blauhaus.Push.Server/Service/PushNotificationsServerService.cs b/src/Blauhaus.Push.Server/Service/PushNotificationsServerService.cs index 9b24c4d..6ce236f 100644 --- a/src/Blauhaus.Push.Server/Service/PushNotificationsServerService.cs +++ b/src/Blauhaus.Push.Server/Service/PushNotificationsServerService.cs @@ -66,7 +66,7 @@ public async Task> UpdateDeviceRegistrationAsync(I await _hubClientProxy.CreateOrUpdateInstallationAsync(installation); - _logger.LogInformation("Push notification registration updated: {PushNotificationInstallation}", installation); + _logger.LogInformation("Push notification registration updated: {@PushNotificationInstallation}", installation); return Response.Success(deviceRegistration); }