Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions GDSMultiPageFormService/MultiPageFormService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
Expand Down