Merge pull request #41 from umbraco/feature/zapier-formrecords-pull

Form polling update

Author: acoumb

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

@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Forms.Core.Data.Storage;
+using Umbraco.Forms.Core.Services;
 using Umbraco.Forms.Integrations.Automation.Zapier.Extensions;
 using Umbraco.Forms.Integrations.Automation.Zapier.Helpers;
 using Umbraco.Forms.Integrations.Automation.Zapier.Services;
@@ -50,14 +52,9 @@ public List<Dictionary<string, string>> GetFormPropertiesById(string id)
 
             var form = _zapierFormService.GetById(id);
 
-            var latestFormRecord = _recordStorage.GetAllRecords(form)
-                .OrderByDescending(p => p.Created)
-                .FirstOrDefault();
+            if(form == null) return new List<Dictionary<string, string>>();
 
-            return form != null && latestFormRecord != null
-                ? new List<Dictionary<string, string>>
-                    {form.ToFormDictionary(latestFormRecord, _umbUrlHelper.GetPageUrl(latestFormRecord.UmbracoPageId))}
-                : new List<Dictionary<string, string>>();
+            return new List<Dictionary<string, string>> { form.ToEmptyFormDictionary() };
         }
     }
 }

src/Umbraco.Forms.Integrations.Automation.Zapier/Extensions/FormExtensions.cs

@@ -26,6 +26,24 @@ public static Dictionary<string, string> ToFormDictionary(this Form form, Record
             return contentDict;
         }
 
+        public static Dictionary<string, string> ToEmptyFormDictionary(this Form form)
+        {
+            var contentDict = new Dictionary<string, string>
+            {
+                { Constants.FormProperties.Id, form.Id.ToString() },
+                { Constants.FormProperties.Name, form.Name },
+                { Constants.FormProperties.SubmissionDate, DateTime.UtcNow.ToString("s") },
+                { Constants.FormProperties.PageUrl, string.Empty }
+            };
+
+            foreach (var field in form.AllFields)
+            {
+                contentDict.Add(field.Alias, string.Empty);
+            }
+
+            return contentDict;
+        }
+
         public static Dictionary<string, string> ToFormDictionary(this Form form)
         {
             var contentDict = new Dictionary<string, string>