From 36b5b29c97bfd38b430e5bafd17093f7a3fcfbe8 Mon Sep 17 00:00:00 2001
From: OluwatobiAwe <oluwatobi.awe@hee.nhs.uk>
Date: Tue, 24 Jan 2023 11:21:40 +0000
Subject: [PATCH 1/2] TD-878 update methods to Task

---
 .../MultiPageFormService.cs                   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/GDSMultiPageFormService/MultiPageFormService.cs b/GDSMultiPageFormService/MultiPageFormService.cs
index ba2c935..0bb8a15 100644
--- a/GDSMultiPageFormService/MultiPageFormService.cs
+++ b/GDSMultiPageFormService/MultiPageFormService.cs
@@ -12,16 +12,16 @@
 
     public interface IMultiPageFormService
     {
-        void SetMultiPageFormData(object formData, MultiPageFormDataFeature feature, ITempDataDictionary tempData);
+        Task SetMultiPageFormData(object formData, MultiPageFormDataFeature feature, ITempDataDictionary tempData);
 
 
-        T GetMultiPageFormData<T>(MultiPageFormDataFeature feature, ITempDataDictionary tempData);
+        Task<T> GetMultiPageFormData<T>(MultiPageFormDataFeature feature, ITempDataDictionary tempData);
 
 
-        void ClearMultiPageFormData(MultiPageFormDataFeature feature, ITempDataDictionary tempData);
+        Task ClearMultiPageFormData(MultiPageFormDataFeature feature, ITempDataDictionary tempData);
 
 
-        bool FormDataExistsForGuidAndFeature(MultiPageFormDataFeature feature, Guid tempDataGuid);
+        Task<bool> FormDataExistsForGuidAndFeature(MultiPageFormDataFeature feature, Guid tempDataGuid);
 
     }
 
@@ -70,7 +70,7 @@ public static void InitConnection(IDbConnection Connection)
             }
         }
 
-        public async void SetMultiPageFormData(object formData, MultiPageFormDataFeature feature, ITempDataDictionary tempData)
+        public async Task SetMultiPageFormData(object formData, MultiPageFormDataFeature feature, ITempDataDictionary tempData)
         {
             var json = JsonConvert.SerializeObject(formData);
             if (useRedisCache)
@@ -121,7 +121,7 @@ public async void SetMultiPageFormData(object formData, MultiPageFormDataFeature
             }
         }
 
-        public T GetMultiPageFormData<T>(MultiPageFormDataFeature feature, ITempDataDictionary tempData)
+        public async Task<T> GetMultiPageFormData<T>(MultiPageFormDataFeature feature, ITempDataDictionary tempData)
         {
             if (tempData[feature.TempDataKey] == null)
             {
@@ -132,7 +132,7 @@ public T GetMultiPageFormData<T>(MultiPageFormDataFeature feature, ITempDataDict
             if (useRedisCache)
             {
                 string MultiPageFormCacheKey = GetMultiPageFormCacheKey(tempDataGuid, feature.Name);
-                var existingMultiPageFormData = this.cacheService.GetAsync<MultiPageFormData>(MultiPageFormCacheKey).Result;
+                var existingMultiPageFormData = await this.cacheService.GetAsync<MultiPageFormData>(MultiPageFormCacheKey);
 
                 if (existingMultiPageFormData == null)
                 {
@@ -164,7 +164,7 @@ public T GetMultiPageFormData<T>(MultiPageFormDataFeature feature, ITempDataDict
 
         }
 
-        public void ClearMultiPageFormData(MultiPageFormDataFeature feature, ITempDataDictionary tempData)
+        public async Task ClearMultiPageFormData(MultiPageFormDataFeature feature, ITempDataDictionary tempData)
         {
             if (tempData[feature.TempDataKey] == null)
             {
@@ -174,7 +174,8 @@ public void ClearMultiPageFormData(MultiPageFormDataFeature feature, ITempDataDi
             if (useRedisCache)
             {
                 string MultiPageFormCacheKey = GetMultiPageFormCacheKey(tempDataGuid, feature.Name);
-                this.cacheService.RemoveAsync(MultiPageFormCacheKey);
+                await this.cacheService.RemoveAsync(MultiPageFormCacheKey);
+                tempData.Remove(feature.TempDataKey);
             }
             else if (_DbConnection != null)
             {
@@ -188,14 +189,14 @@ public void ClearMultiPageFormData(MultiPageFormDataFeature feature, ITempDataDi
             }
         }
 
-        public bool FormDataExistsForGuidAndFeature(MultiPageFormDataFeature feature, Guid tempDataGuid)
+        public async Task<bool> FormDataExistsForGuidAndFeature(MultiPageFormDataFeature feature, Guid tempDataGuid)
         {
             try
             {
                 if (useRedisCache)
                 {
                     string MultiPageFormCacheKey = GetMultiPageFormCacheKey(tempDataGuid, feature.Name);
-                    var existingMultiPageFormData = this.cacheService.GetAsync<MultiPageFormData>(MultiPageFormCacheKey).Result;
+                    var existingMultiPageFormData =await this.cacheService.GetAsync<MultiPageFormData>(MultiPageFormCacheKey);
                     return existingMultiPageFormData != null;
                 }
                 else if (_DbConnection != null)

From 714edcfe22cc4a9e0e987e21dcb9ef62591a886a Mon Sep 17 00:00:00 2001
From: OluwatobiAwe <oluwatobi.awe@hee.nhs.uk>
Date: Tue, 24 Jan 2023 11:40:47 +0000
Subject: [PATCH 2/2] spacing

---
 GDSMultiPageFormService/MultiPageFormService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GDSMultiPageFormService/MultiPageFormService.cs b/GDSMultiPageFormService/MultiPageFormService.cs
index 0bb8a15..6f8322c 100644
--- a/GDSMultiPageFormService/MultiPageFormService.cs
+++ b/GDSMultiPageFormService/MultiPageFormService.cs
@@ -196,7 +196,7 @@ public async Task<bool> FormDataExistsForGuidAndFeature(MultiPageFormDataFeature
                 if (useRedisCache)
                 {
                     string MultiPageFormCacheKey = GetMultiPageFormCacheKey(tempDataGuid, feature.Name);
-                    var existingMultiPageFormData =await this.cacheService.GetAsync<MultiPageFormData>(MultiPageFormCacheKey);
+                    var existingMultiPageFormData = await this.cacheService.GetAsync<MultiPageFormData>(MultiPageFormCacheKey);
                     return existingMultiPageFormData != null;
                 }
                 else if (_DbConnection != null)