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

Update trigger data

Author: acoumb

src/Umbraco.Forms.Integrations.Automation.Zapier/Components/NewFormSubmittedComponent.cs

@@ -17,7 +17,7 @@ public class NewFormSubmittedComposer : ComponentComposer<NewFormSubmittedCompon
 
     public class NewFormSubmittedComponent : IComponent
     {
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly UmbUrlHelper _umbUrlHelper;
 
         private readonly IRecordStorage _recordStorage;
 
@@ -27,12 +27,14 @@ public class NewFormSubmittedComponent : IComponent
 
         private readonly ILogger _logger;
 
-        public NewFormSubmittedComponent(IUmbracoContextAccessor umbracoContextAccessor, IRecordStorage recordStorage, 
+        public NewFormSubmittedComponent(
+            UmbUrlHelper umbUrlHelper, 
+            IRecordStorage recordStorage, 
             ZapierService zapierService, 
             ZapierFormSubscriptionHookService zapierFormSubscriptionHookService,
             ILogger logger)
         {
-            _umbracoContextAccessor = umbracoContextAccessor;
+            _umbUrlHelper = umbUrlHelper;
 
             _recordStorage = recordStorage;
 
@@ -56,13 +58,9 @@ private void RecordStorage_RecordInserting(object sender, Core.RecordEventArgs e
         {
             var triggerHelper = new TriggerHelper(_zapierService);
 
-            UmbracoContext umbracoContext = _umbracoContextAccessor.UmbracoContext;
-            var umbracoPageId = e.Record.UmbracoPageId;
-            var pageUrl = umbracoContext.UrlProvider.GetUrl(umbracoPageId, UrlMode.Absolute);
-
             if (_zapierFormSubscriptionHookService.TryGetById(e.Form.Id.ToString(), out var subscriptionHooks))
             {
-                var content = e.Form.ToFormDictionary(e.Record, pageUrl);
+                var content = e.Form.ToFormDictionary(e.Record, _umbUrlHelper.GetPageUrl(e.Record.UmbracoPageId));
 
                 foreach (var subscriptionHook in subscriptionHooks)
                 {

src/Umbraco.Forms.Integrations.Automation.Zapier/Components/NewFormSubmittedNotification.cs

@@ -16,9 +16,7 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier.Components
 {
     public class NewFormSubmittedNotification : INotificationHandler<RecordCreatingNotification>
     {
-        private readonly IUmbracoHelperAccessor _umbracoHelperAccessor;
-
-        private readonly IPublishedUrlProvider _publishedUrlProvider;
+        private readonly UmbUrlHelper _umbUrlHelper;
 
         private readonly IFormService _formService;
 
@@ -29,15 +27,12 @@ public class NewFormSubmittedNotification : INotificationHandler<RecordCreatingN
         private readonly ILogger<NewFormSubmittedNotification> _logger;
 
         public NewFormSubmittedNotification(
-            IUmbracoHelperAccessor umbracoHelperAccessor,
-            IPublishedUrlProvider publishedUrlProvider,
+            UmbUrlHelper umbUrlHelper,
             IFormService formService, 
             ZapierService zapierService, ZapierFormSubscriptionHookService zapierFormSubscriptionHookService,
             ILogger<NewFormSubmittedNotification> logger)
         {
-            _umbracoHelperAccessor = umbracoHelperAccessor;
-
-            _publishedUrlProvider = publishedUrlProvider;
+            _umbUrlHelper = umbUrlHelper;
 
             _formService = formService;
 
@@ -58,17 +53,7 @@ public void Handle(RecordCreatingNotification notification)
 
                 if (_zapierFormSubscriptionHookService.TryGetById(form.Id.ToString(), out var subscriptionHooks))
                 {
-                    string pageUrl = string.Empty;
-                    if (_umbracoHelperAccessor.TryGetUmbracoHelper(out UmbracoHelper umbracoHelper))
-                    {
-                        IPublishedContent publishedContent = umbracoHelper.Content(notificationSavedEntity.UmbracoPageId);
-                        if (publishedContent != null)
-                        {
-                            pageUrl = publishedContent.Url(_publishedUrlProvider, mode: UrlMode.Absolute);
-                        }
-                    }
-
-                    var content = form.ToFormDictionary(notificationSavedEntity, pageUrl);
+                    var content = form.ToFormDictionary(notificationSavedEntity, _umbUrlHelper.GetPageUrl(notificationSavedEntity.UmbracoPageId));
 
                     foreach (var subscriptionHook in subscriptionHooks)
                     {

src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/FormPollingController.cs

@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-
-using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
+using Umbraco.Forms.Core.Data.Storage;
 using Umbraco.Forms.Integrations.Automation.Zapier.Extensions;
+using Umbraco.Forms.Integrations.Automation.Zapier.Helpers;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
 
 #if NETCOREAPP
@@ -22,32 +21,42 @@ public class FormPollingController : ZapierFormAuthorizedApiController
     {
         private readonly ZapierFormService _zapierFormService;
 
+        private readonly IRecordStorage _recordStorage;
+
+        private readonly UmbUrlHelper _umbUrlHelper;
+
 #if NETCOREAPP
-        public FormPollingController(IOptions<ZapierSettings> options, ZapierFormService zapierFormService, IUserValidationService userValidationService)
+        public FormPollingController(IOptions<ZapierSettings> options, ZapierFormService zapierFormService, IRecordStorage recordStorage, 
+            UmbUrlHelper umbUrlHelper,
+            IUserValidationService userValidationService)
             : base(options, userValidationService)
 #else
-        public FormPollingController(ZapierFormService zapierFormService, IUserValidationService userValidationService)
+        public FormPollingController(ZapierFormService zapierFormService, IRecordStorage recordStorage,
+            UmbUrlHelper umbUrlHelper,
+            IUserValidationService userValidationService)
             : base(userValidationService)
 #endif
         {
             _zapierFormService = zapierFormService;
-        }
 
-        [Obsolete("Used only for Umbraco Zapier app v1.0.0. For updated versions use GetFormById")]
-        public IEnumerable<FormDto> GetSampleForm()
-        {
-            if (!IsUserValid()) return null;
+            _recordStorage = recordStorage;
 
-            return _zapierFormService.GetAll().Take(1);
+            _umbUrlHelper = umbUrlHelper;
         }
 
         public List<Dictionary<string, string>> GetFormPropertiesById(string id)
         {
             if (!IsUserValid()) return new List<Dictionary<string, string>>();
 
             var form = _zapierFormService.GetById(id);
-            return form != null
-                ? new List<Dictionary<string, string>> { form.ToFormDictionary() }
+
+            var latestFormRecord = _recordStorage.GetAllRecords(form)
+                .OrderByDescending(p => p.Created)
+                .FirstOrDefault();
+
+            return form != null && latestFormRecord != null
+                ? new List<Dictionary<string, string>>
+                    {form.ToFormDictionary(latestFormRecord, _umbUrlHelper.GetPageUrl(latestFormRecord.UmbracoPageId))}
                 : new List<Dictionary<string, string>>();
         }
     }

src/Umbraco.Forms.Integrations.Automation.Zapier/Helpers/UmbUrlHelper.cs

@@ -0,0 +1,56 @@
+#if NETCOREAPP
+using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Routing;
+using Umbraco.Cms.Web.Common;
+using Umbraco.Extensions;
+#else
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web;
+#endif
+
+namespace Umbraco.Forms.Integrations.Automation.Zapier.Helpers
+{
+    public class UmbUrlHelper
+    {
+#if NETCOREAPP
+        private readonly IUmbracoHelperAccessor _umbracoHelperAccessor;
+
+        private readonly IPublishedUrlProvider _publishedUrlProvider;
+
+        public UmbUrlHelper(IUmbracoHelperAccessor umbracoHelperAccessor, IPublishedUrlProvider publishedUrlProvider)
+        {
+            _umbracoHelperAccessor = umbracoHelperAccessor;
+
+            _publishedUrlProvider = publishedUrlProvider;
+        }
+#else
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+
+        public UmbUrlHelper(IUmbracoContextAccessor umbracoContextAccessor)
+        {
+            _umbracoContextAccessor = umbracoContextAccessor;
+        }
+#endif
+
+        public string GetPageUrl(int umbracoPageId)
+        {
+#if NETCOREAPP
+            string pageUrl = string.Empty;
+            if (_umbracoHelperAccessor.TryGetUmbracoHelper(out UmbracoHelper umbracoHelper))
+            {
+                IPublishedContent publishedContent = umbracoHelper.Content(umbracoPageId);
+                if (publishedContent != null)
+                {
+                    pageUrl = publishedContent.Url(_publishedUrlProvider, mode: UrlMode.Absolute);
+                }
+            }
+#else
+            UmbracoContext umbracoContext = _umbracoContextAccessor.UmbracoContext;
+            
+            var pageUrl = umbracoContext.UrlProvider.GetUrl(umbracoPageId, UrlMode.Absolute);
+#endif
+
+            return pageUrl;
+        }
+    }
+}

src/Umbraco.Forms.Integrations.Automation.Zapier/ZapierFormsComposer.cs

@@ -4,10 +4,12 @@
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
+using Umbraco.Forms.Integrations.Automation.Zapier.Helpers;
 #else
 using CSharpTest.Net.Collections;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Forms.Integrations.Automation.Zapier.Helpers;
 #endif
 
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
@@ -30,6 +32,8 @@ public void Compose(IUmbracoBuilder builder)
             builder.Services.AddSingleton<ZapierService>();
 
             builder.Services.AddScoped<IUserValidationService, UserValidationService>();
+
+            builder.Services.AddSingleton<UmbUrlHelper>();
         }
 #else
         public void Compose(Composition composition)
@@ -41,6 +45,8 @@ public void Compose(Composition composition)
             composition.Register<ZapierService>(Lifetime.Singleton);
 
             composition.Register<IUserValidationService, UserValidationService>(Lifetime.Scope);
+
+            composition.Register<UmbUrlHelper>(Lifetime.Singleton);
         }
 #endif
     }