Use IFormStorage with V8

Author: acoumb

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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 
 using System.Linq;
-using Umbraco.Forms.Core.Data.Storage;
+
 using Umbraco.Forms.Core.Providers.Models;
 using Umbraco.Forms.Core.Services;
 using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
@@ -12,12 +12,11 @@
 using Microsoft.Extensions.Options;
 
 using Umbraco.Cms.Web.Common.Controllers;
-using Umbraco.Cms.Core.Services;
 #else
 using System.Configuration;
 
+using Umbraco.Forms.Core.Data.Storage;
 using Umbraco.Web.WebApi;
-using Umbraco.Core.Services;
 #endif
 
 namespace Umbraco.Forms.Integrations.Automation.Zapier.Controllers
@@ -26,20 +25,21 @@ public class PollingController : UmbracoApiController
     {
         private readonly ZapierSettings Options;
 
-        private readonly IFormService _formService;
-
         private readonly IUserValidationService _userValidationService;
 
 #if NETCOREAPP
+        private readonly IFormService _formService;
+
         private readonly IWorkflowService _workflowService;
 
-        public PollingController(IOptions<ZapierSettings> options, IFormService formService, IWorkflowService workflowService,
-            IRecordReaderService recordReaderService, IUserValidationService userValidationService)
+        public PollingController(IOptions<ZapierSettings> options, IFormService formService, IWorkflowService workflowService, IUserValidationService userValidationService)
 #else
         private readonly IWorkflowServices _workflowServices;
 
-        public PollingController(IFormService formService, IWorkflowServices workflowServices, 
-            IRecordReaderService recordReaderService, IUserValidationService userValidationService)
+        private readonly IFormStorage _formStorage;
+
+        public PollingController(IWorkflowServices workflowServices, 
+            IFormStorage formStorage, IUserValidationService userValidationService)
 #endif
         {
 #if NETCOREAPP
@@ -50,9 +50,9 @@ public PollingController(IFormService formService, IWorkflowServices workflowSer
             Options = new ZapierSettings(ConfigurationManager.AppSettings);
 
             _workflowServices = workflowServices;
-#endif
 
-            _formService = formService;
+            _formStorage = formStorage;
+#endif
 
             _userValidationService = userValidationService;
         }
@@ -86,7 +86,11 @@ public List<Dictionary<string, string>> GetFormsData()
             if (!isAuthorized) return null;
 
             // 1. get forms
+#if NETCOREAPP
             var forms = _formService.Get();
+#else
+            var forms = _formStorage.GetAll();
+#endif
             foreach (var form in forms)
             {
 #if NETCOREAPP

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

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+
 using Umbraco.Forms.Core.Services;
 using Umbraco.Forms.Integrations.Automation.Zapier.Configuration;
 using Umbraco.Forms.Integrations.Automation.Zapier.Models.Dtos;
@@ -13,6 +14,7 @@
 #else
 using System.Web.Http;
 using System.Configuration;
+using Umbraco.Forms.Core.Data.Storage;
 using Umbraco.Web.WebApi;
 #endif
 
@@ -26,18 +28,21 @@ public class SubscriptionController : UmbracoApiController
         private readonly ILogger<SubscriptionController> _logger;
 
         private readonly IWorkflowService _workflowService;
+
+        private readonly IFormService _formService;
 #else
         private readonly IWorkflowServices _workflowServices;
-#endif
 
-        private readonly IFormService _formService;
+        private readonly IFormStorage _formStorage;
+#endif
 
         private readonly IUserValidationService _userValidationService;
 
 #if NETCOREAPP
-        public SubscriptionController(IOptions<ZapierSettings> options, ILogger<SubscriptionController> logger, IFormService formService, IWorkflowService workflowService, IUserValidationService userValidationService)
+        public SubscriptionController(IOptions<ZapierSettings> options, ILogger<SubscriptionController> logger, IFormService formService, 
+            IWorkflowService workflowService, IUserValidationService userValidationService)
 #else
-        public SubscriptionController(IFormService formService, IWorkflowServices workflowServices, IUserValidationService userValidationService)
+        public SubscriptionController(IWorkflowServices workflowServices, IFormStorage formStorage, IUserValidationService userValidationService)
 #endif
         {
 #if NETCOREAPP
@@ -46,12 +51,15 @@ public SubscriptionController(IFormService formService, IWorkflowServices workfl
             _logger = logger;
 
             _workflowService = workflowService;
+
+            _formService = formService;
 #else
             Options = new ZapierSettings(ConfigurationManager.AppSettings);
 
             _workflowServices = workflowServices;
+
+            _formStorage = formStorage;
 #endif
-            _formService = formService;
 
             _userValidationService = userValidationService;
         }
@@ -88,7 +96,11 @@ public bool UpdatePreferences([FromBody] SubscriptionDto dto)
             try
             {
                 // 1. get forms
+#if NETCOREAPP
                 var forms = _formService.Get();
+#else
+                var forms = _formStorage.GetAll();
+#endif
                 foreach (var form in forms)
                 {
                     // 2. check if 'Trigger Zapier' workflow exists on the form