PR updates.

Author: acoumb

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

@@ -60,13 +60,13 @@ private void RecordStorage_RecordInserting(object sender, Core.RecordEventArgs e
             var umbracoPageId = e.Record.UmbracoPageId;
             var pageUrl = umbracoContext.UrlProvider.GetUrl(umbracoPageId, UrlMode.Absolute);
 
-            if (_zapierFormSubscriptionHookService.TryGetById(e.Form.Id.ToString(), out var zapHookUrls))
+            if (_zapierFormSubscriptionHookService.TryGetById(e.Form.Id.ToString(), out var subscriptionHooks))
             {
                 var content = e.Form.ToFormDictionary(e.Record, pageUrl);
 
-                foreach (var hookUrl in zapHookUrls)
+                foreach (var subscriptionHook in subscriptionHooks)
                 {
-                    var result = triggerHelper.FormExecute(hookUrl, content);
+                    var result = triggerHelper.FormExecute(subscriptionHook, content);
 
                     if (!string.IsNullOrEmpty(result))
                         _logger.Error<NewFormSubmittedComponent>(result);

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

@@ -56,7 +56,7 @@ public void Handle(RecordCreatingNotification notification)
             {
                 var form = _formService.Get(notificationSavedEntity.Form);
 
-                if (_zapierFormSubscriptionHookService.TryGetById(form.Id.ToString(), out var zapHookUrls))
+                if (_zapierFormSubscriptionHookService.TryGetById(form.Id.ToString(), out var subscriptionHooks))
                 {
                     string pageUrl = string.Empty;
                     if (_umbracoHelperAccessor.TryGetUmbracoHelper(out UmbracoHelper umbracoHelper))
@@ -70,10 +70,10 @@ public void Handle(RecordCreatingNotification notification)
 
                     var content = form.ToFormDictionary(notificationSavedEntity, pageUrl);
 
-                    foreach (var hookUrl in zapHookUrls)
+                    foreach (var subscriptionHook in subscriptionHooks)
                     {
                         var result =
-                            triggerHelper.FormExecute(hookUrl, content);
+                            triggerHelper.FormExecute(subscriptionHook, content);
 
                         if(!string.IsNullOrEmpty(result))
                             _logger.LogError(result);

src/Umbraco.Forms.Integrations.Automation.Zapier/Services/ZapierFormSubscriptionHookService.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
 
 #if NETCOREAPP
 using Microsoft.Extensions.Logging;
@@ -42,7 +43,7 @@ public bool TryGetById(string id, out IEnumerable<string> dto)
             {
                 var entities =
                     scope.Database
-                        .Query<string>( "SELECT HookUrl FROM zapierSubscriptionHook where EntityId = @0 and Type = 2", id).ToArray();
+                        .Query<string>( "SELECT HookUrl FROM zapierSubscriptionHook where EntityId=@0", id).ToArray();
 
                 dto = entities;