Support for multiple statuses.

notifo-io · Aug 3, 2023 · dbbe3dd · dbbe3dd
1 parent 0507376
commit dbbe3dd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/backend/src/Notifo.Domain.Integrations/MessageBird/MessageBirdSmsIntegration.Sms.cs b/backend/src/Notifo.Domain.Integrations/MessageBird/MessageBirdSmsIntegration.Sms.cs
@@ -105,7 +105,6 @@ public async Task HandleRequestAsync(IntegrationContext context, HttpContext htt
         var status = await GetClient(context).ParseSmsWebhookAsync(httpContext);
 
         var result = ParseStatus(status);
-
         if (result == default)
         {
             return;

diff --git a/...nd/src/Notifo.Domain.Integrations/MessageBird/MessageBirdWhatsAppIntegration.Messaging.cs b/...nd/src/Notifo.Domain.Integrations/MessageBird/MessageBirdWhatsAppIntegration.Messaging.cs
@@ -119,7 +119,6 @@ public async Task HandleRequestAsync(IntegrationContext context, HttpContext htt
         }
 
         var deliveryStatus = ParseStatus(status);
-
         if (deliveryStatus == default)
         {
             return;

diff --git a/backend/src/Notifo.Domain.Integrations/OpenNotifications/OpenNotificationsSmsIntegration.cs b/backend/src/Notifo.Domain.Integrations/OpenNotifications/OpenNotificationsSmsIntegration.cs
@@ -68,36 +68,35 @@ public async Task HandleRequestAsync(IntegrationContext context, HttpContext htt
 
         var response = await Client.Providers.HandleWebhookAsync(requestDto, default);
 
-        var http = response.Http;
-
-        if (http != null)
+        if (response.Http != null)
         {
             var httpResponse = httpContext.Response;
 
-            if (http.Headers != null)
+            if (response.Http.Headers != null)
             {
-                foreach (var (key, value) in http.Headers)
+                foreach (var (key, value) in response.Http.Headers)
                 {
                     httpResponse.Headers[key] = value;
                 }
             }
 
-            if (http.StatusCode != null)
+            if (response.Http.StatusCode != null)
             {
-                httpResponse.StatusCode = http.StatusCode.Value;
+                httpResponse.StatusCode = response.Http.StatusCode.Value;
             }
 
-            if (http.Body != null)
+            if (response.Http.Body != null)
             {
-                await httpResponse.WriteAsync(http.Body, default);
+                await httpResponse.WriteAsync(response.Http.Body, default);
             }
         }
 
-        var status = response.Status;
-
-        if (status != null)
+        if (response.Statuses != null)
         {
-            await context.UpdateStatusAsync(status.TrackingToken, status.ToDeliveryResult());
+            foreach (var status in response.Statuses)
+            {
+                await context.UpdateStatusAsync(status.TrackingToken, status.ToDeliveryResult());
+            }
         }
     }
 }
diff --git a/backend/src/Notifo.Domain.Integrations/Telegram/TelegramIntegration.Messaging.cs b/backend/src/Notifo.Domain.Integrations/Telegram/TelegramIntegration.Messaging.cs
@@ -112,7 +112,6 @@ private async Task UpdateUser(IntegrationContext context, TelegramUser from, Tel
         }
 
         var user = await context.IntegrationAdapter.FindUserByPropertyAsync(context.AppId, UserUsername.Name, username, default);
-
         if (user == null)
         {
             await SendMessageAsync(context, GetUserNotFoundMessage(context), chatId, ct);

diff --git a/backend/src/Notifo.Domain.Integrations/Telekom/TelekomSmsIntegration.Sms.cs b/backend/src/Notifo.Domain.Integrations/Telekom/TelekomSmsIntegration.Sms.cs
@@ -95,7 +95,6 @@ public Task HandleRequestAsync(IntegrationContext context, HttpContext httpConte
         var status = httpContext.Request.Form[RequestKeys.MessageStatus].ToString();
 
         var result = ParseStatus(status);
-
         if (result == default)
         {
             return Task.CompletedTask;

diff --git a/backend/src/Notifo.Domain.Integrations/Twilio/TwilioSmsIntegration.Sms.cs b/backend/src/Notifo.Domain.Integrations/Twilio/TwilioSmsIntegration.Sms.cs
@@ -83,7 +83,6 @@ public Task HandleRequestAsync(IntegrationContext context, HttpContext httpConte
         var status = httpContext.Request.Form[RequestKeys.MessageStatus].ToString();
 
         var result = ParseStatus(status);
-
         if (result == default)
         {
             return Task.CompletedTask;