Allow multiple subscription hooks with a single content item & helper method for triggering

Author: acoumb

src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedComponent.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-
+using Umbraco.Cms.Integrations.Automation.Zapier.Helpers;
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
@@ -47,24 +47,19 @@ public void Terminate()
 
         private void ContentServiceOnPublished(IContentService sender, ContentPublishedEventArgs e)
         {
+            var triggerHelper = new TriggerHelper(_zapierService);
+
             foreach (var node in e.PublishedEntities)
             {
-                if (_zapierSubscriptionHookService.TryGetByAlias(node.ContentType.Alias, out var zapContentConfig))
+                if (_zapierSubscriptionHookService.TryGetByAlias(node.ContentType.Alias, out var zapContentConfigList))
                 {
-                    var content = new Dictionary<string, string>
+                    foreach (var zapContentConfig in zapContentConfigList)
                     {
-                        {Constants.Content.Id, node.Id.ToString()},
-                        {Constants.Content.Name, node.Name},
-                        {Constants.Content.PublishDate, DateTime.UtcNow.ToString()}
-                    };
-
-                    var t = Task.Run(
-                        async () => await _zapierService.TriggerAsync(zapContentConfig.HookUrl, content));
-
-                    var result = t.Result;
+                        var result = triggerHelper.Execute(zapContentConfig.HookUrl, node.Id.ToString(), node.Name);
 
-                    if (!string.IsNullOrEmpty(result))
-                        _logger.Error<NewContentPublishedComponent>(result);
+                        if (!string.IsNullOrEmpty(result))
+                            _logger.Error<NewContentPublishedComponent>(result);
+                    }
                 }
             }
         }

src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedNotification.cs

@@ -7,6 +7,7 @@
 
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Integrations.Automation.Zapier.Helpers;
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Components
@@ -30,24 +31,19 @@ public NewContentPublishedNotification(ZapierSubscriptionHookService zapierSubsc
 
         public void Handle(ContentPublishedNotification notification)
         {
+            var triggerHelper = new TriggerHelper(_zapierService);
+
             foreach (var node in notification.PublishedEntities)
             {
-                if (_zapierSubscriptionHookService.TryGetByAlias(node.ContentType.Alias, out var zapContentConfig))
+                if (_zapierSubscriptionHookService.TryGetByAlias(node.ContentType.Alias, out var zapContentConfigList))
                 {
-                    var content = new Dictionary<string, string>
+                    foreach (var zapContentConfig in zapContentConfigList)
                     {
-                        {Constants.Content.Id, node.Id.ToString()},
-                        {Constants.Content.Name, node.Name},
-                        {Constants.Content.PublishDate, DateTime.UtcNow.ToString()}
-                    };
-
-                    var t = Task.Run(
-                        async () => await _zapierService.TriggerAsync(zapContentConfig.HookUrl, content));
-
-                    var result = t.Result;
+                        var result = triggerHelper.Execute(zapContentConfig.HookUrl, node.Id.ToString(), node.Name);
 
-                    if (!string.IsNullOrEmpty(result))
-                        _logger.LogError(result);
+                        if (!string.IsNullOrEmpty(result))
+                            _logger.LogError(result);
+                    }
                 }
             }
         }

src/Umbraco.Cms.Integrations.Automation.Zapier/Controllers/ContentController.cs

@@ -79,7 +79,6 @@ public IEnumerable<ContentTypeDto> GetContentTypes()
             var contentTypes = _contentTypeService.GetAll();
 
             return contentTypes
-                .Where(p => !_zapierSubscriptionHookService.TryGetByAlias(p.Alias, out var contentConfig))
                 .Select(q => new ContentTypeDto
                 {
                     Id = q.Id,

src/Umbraco.Cms.Integrations.Automation.Zapier/Helpers/TriggerHelper.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Umbraco.Cms.Integrations.Automation.Zapier.Services;
+
+namespace Umbraco.Cms.Integrations.Automation.Zapier.Helpers
+{
+    public class TriggerHelper
+    {
+        private readonly ZapierService _zapierService;
+
+        public TriggerHelper(ZapierService zapierService)
+        {
+            _zapierService = zapierService;
+        }
+
+        public string Execute(string hookUrl, string contentId, string contentName)
+        {
+            var content = new Dictionary<string, string>
+            {
+                {Constants.Content.Id, contentId},
+                {Constants.Content.Name, contentName},
+                {Constants.Content.PublishDate, DateTime.UtcNow.ToString()}
+            };
+
+            var t = Task.Run(
+                async () => await _zapierService.TriggerAsync(hookUrl, content));
+
+            return t.Result;
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Automation.Zapier/Services/ZapierSubscriptionHookService.cs

@@ -121,19 +121,21 @@ public string Delete(string contentTypeAlias, string hookUrl)
             }
         }
 
-        public bool TryGetByAlias(string contentTypeAlias, out ContentConfigDto dto)
+        public bool TryGetByAlias(string contentTypeAlias, out IEnumerable<ContentConfigDto> dto)
         {
             using (var scope = _scopeProvider.CreateScope())
             {
-                var entity =
+                var entities =
                     scope.Database
-                        .FirstOrDefault<ZapierSubscriptionHookTable.ZapierSubscriptionHook>("where ContentTypeAlias = @0", contentTypeAlias);
+                        .Query<ZapierSubscriptionHookTable.ZapierSubscriptionHook>()
+                        .Where(p => p.ContentTypeAlias == contentTypeAlias)
+                        .ToList();
 
-                dto = entity != null
-                    ? new ContentConfigDto {HookUrl = entity.HookUrl}
+                dto = entities.Any()
+                    ? entities.Select(p => new ContentConfigDto { HookUrl = p.HookUrl })
                     : null;
 
-                return entity != null;
+                return entities.Any();
             }
         }
     }