updated subscription and polling controllers

Author: acoumb

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

@@ -3,6 +3,7 @@
 using System.Linq;
 
 using Umbraco.Cms.Integrations.Automation.Zapier.Configuration;
+using Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
 
 #if NETCOREAPP
@@ -44,7 +45,7 @@ public PollingController(IContentService contentService, IUserValidationService
             _userValidationService = userValidationService;
         }
 
-        public List<Dictionary<string, string>> GetContent()
+        public IEnumerable<PublishedContentDto> GetSampleContent()
         {
             string username = string.Empty;
             string password = string.Empty;
@@ -70,18 +71,15 @@ public List<Dictionary<string, string>> GetContent()
             var isAuthorized = _userValidationService.Validate(username, password, Options.UserGroup).GetAwaiter().GetResult();
             if (!isAuthorized) return null;
 
-            var root = _contentService.GetRootContent().Where(p => p.Published)
-                .OrderByDescending(p => p.PublishDate).FirstOrDefault();
+            var rootNodes = _contentService.GetRootContent().Where(p => p.Published)
+                .OrderByDescending(p => p.PublishDate);
 
-            return new List<Dictionary<string, string>>
+            return rootNodes.Select(p => new PublishedContentDto
             {
-                new Dictionary<string, string>
-                {
-                    {Constants.Content.Id, root?.Id.ToString()},
-                    {Constants.Content.Name, root?.Name},
-                    {Constants.Content.PublishDate, root?.PublishDate.ToString()}
-                }
-            };
+                Id = p.Id,
+                Name = p.Name,
+                PublishDate = p.PublishDate.Value.ToString()
+            });
         }
 
     }

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

@@ -71,7 +71,7 @@ public bool UpdatePreferences([FromBody] SubscriptionDto dto)
 
             if (dto == null) return false;
 
-            var result = _zapConfigService.UpdatePreferences(dto.HookUrl, dto.Enable);
+            var result = _zapConfigService.Subscribe(dto.HookUrl, dto.ContentType);
 
             return string.IsNullOrEmpty(result);
         }

src/Umbraco.Cms.Integrations.Automation.Zapier/Models/Dtos/SubscriptionDto.cs

@@ -7,7 +7,7 @@ public class SubscriptionDto
         [JsonProperty("hookUrl")]
         public string HookUrl { get; set; }
 
-        [JsonProperty("enable")]
-        public bool Enable { get; set; }
+        [JsonProperty("content_type")]
+        public string ContentType { get; set; }
     }
 }

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

@@ -132,6 +132,7 @@ public string UpdatePreferences(string hookUrl, bool enabled)
                     if (entity != null)
                     {
                         entity.IsEnabled = enabled;
+
                         scope.Database.Update(entity);
                     }
 
@@ -144,6 +145,39 @@ public string UpdatePreferences(string hookUrl, bool enabled)
             {
                 var message = $"An error has occurred while updating a hook: {e.Message}";
 
+#if NETCOREAPP
+                _logger.LogError(message);
+#else
+                _logger.Error<ZapConfigService>(message);
+#endif
+
+                return message;
+            }
+        }
+
+        public string Subscribe(string hookUrl, string contentType)
+        {
+            try
+            {
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    var zapContentConfig = new ZapContentConfigTable.ZapContentConfig
+                    {
+                        ContentTypeName = contentType,
+                        WebHookUrl = hookUrl,
+                        IsEnabled = true
+                    };
+
+                    scope.Database.Insert(zapContentConfig);
+                    scope.Complete();
+                }
+
+                return string.Empty;
+            }
+            catch (Exception e)
+            {
+                var message = $"An error has occurred while updating a hook: {e.Message}";
+
 #if NETCOREAPP
                 _logger.LogError(message);
 #else