Merge pull request #27 from umbraco/feature/zapier-trigger-data

Feature/zapier trigger data

Author: acoumb

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

@@ -1,15 +1,14 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
 using Umbraco.Cms.Integrations.Automation.Zapier.Extensions;
-using Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos;
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
 
 #if NETCOREAPP
 using Microsoft.Extensions.Options;
-
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Web.Common;
 using Umbraco.Cms.Integrations.Automation.Zapier.Configuration;
 #else
 using Umbraco.Core.Services;
@@ -24,38 +23,25 @@ namespace Umbraco.Cms.Integrations.Automation.Zapier.Controllers
     /// </summary>
     public class PollingController : ZapierAuthorizedApiController
     {
-        private IContentService _contentService;
-
-        private IContentTypeService _contentTypeService;
+        private readonly IContentTypeService _contentTypeService;
 
 #if NETCOREAPP
-        public PollingController(IOptions<ZapierSettings> options, IContentService contentService, IContentTypeService contentTypeService, IUserValidationService userValidationService)
+        private readonly UmbracoHelper _umbracoHelper;
+
+        public PollingController(IOptions<ZapierSettings> options, IContentService contentService, IContentTypeService contentTypeService, UmbracoHelper umbracoHelper, 
+            IUserValidationService userValidationService)
             : base(options, userValidationService)
 #else
-        public PollingController(IContentService contentService, IContentTypeService contentTypeService, IUserValidationService userValidationService)
+        public PollingController(IContentTypeService contentTypeService, IUserValidationService userValidationService)
             : base(userValidationService)
 #endif
         {
-            _contentService = contentService;
-
             _contentTypeService = contentTypeService;
-        }
-
-        [Obsolete("Used only for Umbraco Zapier app v1.0.0. For updated versions use GetContentByType")]
-        public IEnumerable<PublishedContentDto> GetSampleContent()
-        {
-            if (!IsAccessValid()) return null;
 
-            var rootNodes = _contentService.GetRootContent()
-                .Where(p => p.Published)
-                .OrderByDescending(p => p.PublishDate);
-
-            return rootNodes.Select(p => new PublishedContentDto
-            {
-                Id = p.Id.ToString(),
-                Name = p.Name,
-                PublishDate = p.PublishDate.Value.ToString()
-            });
+#if NETCOREAPP
+            _umbracoHelper = umbracoHelper;
+#else
+#endif
         }
 
         public List<Dictionary<string, string>> GetContentByType(string alias)
@@ -65,7 +51,15 @@ public List<Dictionary<string, string>> GetContentByType(string alias)
             var contentType = _contentTypeService.Get(alias);
             if (contentType == null) return new List<Dictionary<string, string>>();
 
-            return new List<Dictionary<string, string>> { contentType.ToContentTypeDictionary() };
+#if NETCOREAPP
+            var contentItems = _umbracoHelper.ContentAtXPath("//" + alias)
+                .OrderByDescending(p => p.UpdateDate);
+#else
+            var contentItems = Umbraco.ContentAtXPath("//" + alias)
+                .OrderByDescending(p => p.UpdateDate);
+#endif
+
+            return new List<Dictionary<string, string>> { contentType.ToContentTypeDictionary(contentItems.FirstOrDefault()) };
         }
 
 

src/Umbraco.Cms.Integrations.Automation.Zapier/Extensions/ContentExtensions.cs

@@ -1,28 +1,39 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 #if NETCOREAPP
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.PublishedContent;
 #else
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
 #endif
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Extensions
 {
     public static class ContentExtensions
     {
-        public static Dictionary<string, string> ToContentTypeDictionary(this IContentType contentType)
+        public static Dictionary<string, string> ToContentTypeDictionary(this IContentType contentType, IPublishedContent content)
         {
             var contentDict = new Dictionary<string, string>
             {
-                {Constants.ContentProperties.Id, "1" },
-                {Constants.ContentProperties.Name, contentType.Name },
-                {Constants.ContentProperties.PublishDate, DateTime.UtcNow.ToString("s") }
+                {Constants.ContentProperties.Id, content != null ? content.Id.ToString() : "1" },
+                {Constants.ContentProperties.Name, content != null ? content.Name : contentType.Name },
+                {Constants.ContentProperties.PublishDate, content != null ? content.UpdateDate.ToString("s") : DateTime.UtcNow.ToString("s") }
             };
 
             foreach (var propertyType in contentType.PropertyTypes)
             {
-                contentDict.Add(propertyType.Alias, string.Empty);
+                if (content == null)
+                {
+                    contentDict.Add(propertyType.Alias, string.Empty);
+                    continue;
+                }
+
+                var contentProperty = content.Properties.First(p => p.Alias == propertyType.Alias);
+
+                contentDict.Add(propertyType.Alias, contentProperty.GetValue().ToString());
             }
 
             return contentDict;