Subscription model updates

Author: acoumb

src/Umbraco.Cms.Integrations.Automation.Zapier/Constants.cs

@@ -23,13 +23,20 @@ public static class Configuration
             public const string Settings = "Umbraco:Forms:Integrations:Automation:Zapier:Settings";
         }
 
-        public static class Content
+        public static class ContentProperties
         {
             public const string Id = "id";
 
             public const string Name = "name";
 
             public const string PublishDate = "publishDate";
         }
+
+        public static class EntityType
+        {
+            public const int Content = 1;
+
+            public const int Form = 2;
+        }
     }
 }

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

@@ -15,9 +15,9 @@ public static Dictionary<string, string> ToContentTypeDictionary(this IContentTy
         {
             var contentDict = new Dictionary<string, string>
             {
-                {Constants.Content.Id, "1" },
-                {Constants.Content.Name, contentType.Name },
-                {Constants.Content.PublishDate, DateTime.UtcNow.ToString("s") }
+                {Constants.ContentProperties.Id, "1" },
+                {Constants.ContentProperties.Name, contentType.Name },
+                {Constants.ContentProperties.PublishDate, DateTime.UtcNow.ToString("s") }
             };
 
             foreach (var propertyType in contentType.PropertyTypes)
@@ -32,9 +32,9 @@ public static Dictionary<string, string> ToContentDictionary(this IContent conte
         {
             var contentDict = new Dictionary<string, string>
             {
-                {Constants.Content.Id, contentNode.Id.ToString() },
-                {Constants.Content.Name, contentNode.Name },
-                {Constants.Content.PublishDate, contentNode.UpdateDate.ToString("s") }
+                {Constants.ContentProperties.Id, contentNode.Id.ToString() },
+                {Constants.ContentProperties.Name, contentNode.Name },
+                {Constants.ContentProperties.PublishDate, contentNode.UpdateDate.ToString("s") }
             };
 
             foreach (var prop in contentNode.Properties)

src/Umbraco.Cms.Integrations.Automation.Zapier/Migrations/ZapierMigration.cs

@@ -66,7 +66,6 @@ public class ZapierSubscriptionHookTable
             /// 2. form ID for form triggers
             /// </summary>
             [Column("EntityId")]
-            [Index(IndexTypes.UniqueNonClustered, Name = "IX_ZapierSubscriptionHook_EntityId")]
             public string EntityId { get; set; }
 
             [Column("Type")]

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

@@ -1,4 +1,4 @@
-using System;
+using System.Linq;
 
 using Newtonsoft.Json;
 
@@ -15,9 +15,20 @@ public class SubscriptionDto
         [JsonProperty("type")]
         public int Type { get; set; }
 
-        [JsonProperty("typeName")] 
-        public string TypeName => Enum.Parse(typeof(EntityDto.Type), Type.ToString()).ToString();
+        [JsonProperty("typeName")]
+        public string TypeName
+        {
+            get
+            {
+                var entityType = typeof(Constants.EntityType);
 
+                var typeField = entityType.GetFields()
+                    .FirstOrDefault(p => p.GetValue(entityType).Equals(Type));
+                
+                return typeField != null ? typeField.Name : string.Empty;
+            }
+        }
+        
         [JsonProperty("hookUrl")]
         public string HookUrl { get; set; }