Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Refactor to async methods and remove RabbitMQ (#567)

Krzysztof Pajak462db62de574
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 392e1093d..05e9703a7 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -23,8 +23,6 @@
<PackageVersion Include="DotLiquid" Version="2.3.18" />
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
<PackageVersion Include="GoogleAuthenticator" Version="3.2.0" />
- <PackageVersion Include="MassTransit" Version="8.3.5" />
- <PackageVersion Include="MassTransit.RabbitMQ" Version="8.3.5" />
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.1" />
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
index fa79c12c6..10c09ae01 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
@@ -22,15 +22,12 @@ public class GetPriceByCustomerProductQueryHandler : IRequestHandler<GetPriceByC
public async Task<double?> Handle(GetPriceByCustomerProductQuery request, CancellationToken cancellationToken)
{
var key = string.Format(CacheKey.CUSTOMER_PRODUCT_PRICE_KEY_ID, request.CustomerId, request.ProductId);
- var productPrice = _cacheBase.Get(key, () =>
+ var productPrice = await _cacheBase.GetAsync(key, async () =>
{
- var pp = _customerProductPriceRepository.Table
- .FirstOrDefault(x => x.CustomerId == request.CustomerId && x.ProductId == request.ProductId);
- return pp == null ? (null, false) : (pp, true);
+ var pp = _customerProductPriceRepository.Table.FirstOrDefault(x => x.CustomerId == request.CustomerId && x.ProductId == request.ProductId);
+ return await Task.FromResult(pp);
});
- if (!productPrice.Item2)
- return await Task.FromResult(default(double?));
- return await Task.FromResult(productPrice.pp.Price);
+ return productPrice?.Price;
}
}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
index 3e209f623..78abb1d21 100644
--- a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
@@ -56,7 +56,7 @@ public class PaymentService : IPaymentService
public virtual async Task<IList<IPaymentProvider>> LoadActivePaymentMethods(Customer customer = null,
string storeId = "", string filterByCountryId = "")
{
- var pm = LoadAllPaymentMethods(customer, storeId, filterByCountryId)
+ var pm = (await LoadAllPaymentMethods(customer, storeId, filterByCountryId))
.Where(provider =>
_paymentSettings.ActivePaymentProviderSystemNames.Contains(provider.SystemName,
StringComparer.OrdinalIgnoreCase))
@@ -69,7 +69,7 @@ public class PaymentService : IPaymentService
if (selectedShippingOption == null) return await Task.FromResult(pm);
for (var i = pm.Count - 1; i >= 0; i--)
{
- var restrictedGroupIds = GetRestrictedShippingIds(pm[i]);
+ var restrictedGroupIds =await GetRestrictedShippingIds(pm[i]);
if (restrictedGroupIds.Contains(selectedShippingOption.Name)) pm.Remove(pm[i]);
}
@@ -94,7 +94,7 @@ public class PaymentService : IPaymentService
/// <param name="customer">Customer</param>
/// <param name="filterByCountryId">Load records allowed only in a specified country; pass "" to load all records</param>
/// <returns>Payment providers</returns>
- public virtual IList<IPaymentProvider> LoadAllPaymentMethods(Customer customer = null, string storeId = "",
+ public virtual async Task<IList<IPaymentProvider>> LoadAllPaymentMethods(Customer customer = null, string storeId = "",
string filterByCountryId = "")
{
var paymentMethods = _paymentProviders
@@ -102,14 +102,20 @@ public class PaymentService : IPaymentService
x.IsAuthenticateStore(storeId) &&
x.IsAuthenticateGroup(customer))
.OrderBy(x => x.Priority).ToList();
- return string.IsNullOrEmpty(filterByCountryId)
- ? paymentMethods
- :
- //filter by country
- (from pm in paymentMethods
- let restrictedCountryIds = GetRestrictedCountryIds(pm)
- where !restrictedCountryIds.Contains(filterByCountryId)
- select pm).ToList();
+
+ if (string.IsNullOrEmpty(filterByCountryId))
+ return paymentMethods;
+
+ var filteredPaymentMethods = new List<IPaymentProvider>();
+ foreach (var pm in paymentMethods)
+ {
+ var restrictedCountryIds = await GetRestrictedCountryIds(pm);
+ if (!restrictedCountryIds.Contains(filterByCountryId))
+ {
+ filteredPaymentMethods.Add(pm);
+ }
+ }
+ return filteredPaymentMethods;
}
/// <summary>
@@ -117,12 +123,12 @@ public class PaymentService : IPaymentService
/// </summary>
/// <param name="paymentMethod">Payment method</param>
/// <returns>A list of country identifiers</returns>
- public virtual IList<string> GetRestrictedCountryIds(IPaymentProvider paymentMethod)
+ public virtual async Task<IList<string>> GetRestrictedCountryIds(IPaymentProvider paymentMethod)
{
ArgumentNullException.ThrowIfNull(paymentMethod);
var settingKey = $"PaymentMethodRestictions.{paymentMethod.SystemName}";
- var restrictedCountryIds = _settingService.GetSettingByKey<PaymentRestrictedSettings>(settingKey);
+ var restrictedCountryIds = await _settingService.GetSettingByKey<PaymentRestrictedSettings>(settingKey);
return restrictedCountryIds == null ? new List<string>() : restrictedCountryIds.Ids;
}
@@ -131,12 +137,12 @@ public class PaymentService : IPaymentService
/// </summary>
/// <param name="paymentMethod">Payment method</param>
/// <returns>A list of role identifiers</returns>
- public virtual IList<string> GetRestrictedShippingIds(IPaymentProvider paymentMethod)
+ public virtual async Task<IList<string>> GetRestrictedShippingIds(IPaymentProvider paymentMethod)
{
ArgumentNullException.ThrowIfNull(paymentMethod);
var settingKey = $"PaymentMethodRestictionsShipping.{paymentMethod.SystemName}";
- var restrictedShippingIds = _settingService.GetSettingByKey<PaymentRestrictedSettings>(settingKey);
+ var restrictedShippingIds = await _settingService.GetSettingByKey<PaymentRestrictedSettings>(settingKey);
return restrictedShippingIds == null ? new List<string>() : restrictedShippingIds.Ids;
}
diff --git a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
index b5e71981e..443e7f4ad 100644
--- a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
+++ b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
@@ -59,15 +59,14 @@ public class SettingService : ISettingService
/// </summary>
/// <param name="setting">Setting</param>
/// <param name="clearCache">A value indicating whether to clear cache after setting update</param>
- public virtual async Task InsertSetting(Setting setting, bool clearCache = true)
+ public virtual async Task InsertSetting(Setting setting)
{
ArgumentNullException.ThrowIfNull(setting);
await _settingRepository.InsertAsync(setting);
//cache
- if (clearCache)
- await _cacheBase.Clear();
+ await _cacheBase.Clear();
}
/// <summary>
@@ -75,15 +74,14 @@ public class SettingService : ISettingService
/// </summary>
/// <param name="setting">Setting</param>
/// <param name="clearCache">A value indicating whether to clear cache after setting update</param>
- public virtual async Task UpdateSetting(Setting setting, bool clearCache = true)
+ public virtual async Task UpdateSetting(Setting setting)
{
ArgumentNullException.ThrowIfNull(setting);
await _settingRepository.UpdateAsync(setting);
//cache
- if (clearCache)
- await _cacheBase.Clear();
+ await _cacheBase.Clear();
}
/// <summary>
@@ -119,21 +117,21 @@ public class SettingService : ISettingService
/// <param name="defaultValue">Default value</param>
/// <param name="storeId">Store identifier</param>
/// <returns>Setting value</returns>
- public virtual T GetSettingByKey<T>(string key, T defaultValue = default, string storeId = "")
+ public virtual async Task<T> GetSettingByKey<T>(string key, T defaultValue = default, string storeId = "")
{
if (string.IsNullOrEmpty(key))
return defaultValue;
var keyCache = string.Format(CacheKey.SETTINGS_BY_KEY, key, storeId);
- return _cacheBase.Get(keyCache, () =>
+ return await _cacheBase.GetAsync<T>(keyCache, () =>
{
var settings = GetSettingsByName(key);
key = key.Trim().ToLowerInvariant();
- if (!settings.Any()) return defaultValue;
+ if (!settings.Any()) return Task.FromResult(defaultValue);
var setting = settings.FirstOrDefault(x => x.StoreId == storeId) ??
settings.FirstOrDefault(x => string.IsNullOrEmpty(x.StoreId));
- return setting != null ? JsonSerializer.Deserialize<T>(setting.Metadata) : defaultValue;
+ return setting != null ? Task.FromResult(JsonSerializer.Deserialize<T>(setting.Metadata)) : Task.FromResult(defaultValue);
});
}
@@ -145,7 +143,7 @@ public class SettingService : ISettingService
/// <param name="value">Value</param>
/// <param name="storeId">Store identifier</param>
/// <param name="clearCache">A value indicating whether to clear cache after setting update</param>
- public virtual async Task SetSetting<T>(string key, T value, string storeId = "", bool clearCache = true)
+ public virtual async Task SetSetting<T>(string key, T value, string storeId = "")
{
ArgumentNullException.ThrowIfNull(key);
@@ -157,7 +155,7 @@ public class SettingService : ISettingService
{
//update
setting.Metadata = JsonSerializer.Serialize(value);
- await UpdateSetting(setting, clearCache);
+ await UpdateSetting(setting);
}
else
{
@@ -168,7 +166,7 @@ public class SettingService : ISettingService
Metadata = metadata,
StoreId = storeId
};
- await InsertSetting(setting, clearCache);
+ await InsertSetting(setting);
}
}
@@ -186,9 +184,9 @@ public class SettingService : ISettingService
/// </summary>
/// <typeparam name="T">Type</typeparam>
/// <param name="storeId">Store identifier for which settings should be loaded</param>
- public virtual T LoadSetting<T>(string storeId = "") where T : ISettings, new()
+ public virtual Task<T> LoadSetting<T>(string storeId = "") where T : ISettings, new()
{
- return (T)LoadSetting(typeof(T), storeId);
+ return Task.FromResult((T)LoadSetting(typeof(T), storeId));
}
/// <summary>
@@ -208,7 +206,9 @@ public class SettingService : ISettingService
if (setting == null && !string.IsNullOrEmpty(storeId))
setting = settings.FirstOrDefault(x => string.IsNullOrEmpty(x.StoreId));
- if (setting != null) return JsonSerializer.Deserialize(setting.Metadata, type) as ISettings;
+ if (setting != null)
+ return JsonSerializer.Deserialize(setting.Metadata, type) as ISettings;
+
return Activator.CreateInstance(type) as ISettings;
});
}
@@ -239,9 +239,6 @@ public class SettingService : ISettingService
};
await InsertSetting(setting);
}
-
- //and now clear cache
- await ClearCache();
}
/// <summary>
diff --git a/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentService.cs
index 22d8317cb..5f35ac822 100644
--- a/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentService.cs
@@ -35,7 +35,7 @@ public interface IPaymentService
/// <param name="customer">Customer</param>
/// <param name="filterByCountryId">Specified country</param>
/// <returns>Payment providers</returns>
- IList<IPaymentProvider> LoadAllPaymentMethods(Customer customer = null, string storeId = "",
+ Task<IList<IPaymentProvider>> LoadAllPaymentMethods(Customer customer = null, string storeId = "",
string filterByCountryId = "");
/// <summary>
@@ -43,14 +43,14 @@ public interface IPaymentService
/// </summary>
/// <param name="paymentMethod">Payment method</param>
/// <returns>A list of country identifiers</returns>
- IList<string> GetRestrictedCountryIds(IPaymentProvider paymentMethod);
+ Task<IList<string>> GetRestrictedCountryIds(IPaymentProvider paymentMethod);
/// <summary>
/// Gets a list of shipping identifiers in which a certain payment method is now allowed
/// </summary>
/// <param name="paymentMethod">Payment method</param>
/// <returns>A list of role identifiers</returns>
- IList<string> GetRestrictedShippingIds(IPaymentProvider paymentMethod);
+ Task<IList<string>> GetRestrictedShippingIds(IPaymentProvider paymentMethod);
/// <summary>
/// Saves a list of country identifiers in which a certain payment method is now allowed
diff --git a/src/Business/Grand.Business.Core/Interfaces/Common/Configuration/ISettingService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Configuration/ISettingService.cs
index 9c0e6266e..c5e72049c 100644
--- a/src/Business/Grand.Business.Core/Interfaces/Common/Configuration/ISettingService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Configuration/ISettingService.cs
@@ -11,16 +11,14 @@ public interface ISettingService
/// Adds a setting
/// </summary>
/// <param name="setting">Setting</param>
- /// <param name="clearCache">A value indicating whether to clear cache after setting update</param>
- Task InsertSetting(Setting setting, bool clearCache = true);
+ Task InsertSetting(Setting setting);
/// <summary>
/// Update setting
/// </summary>
/// <param name="setting"></param>
- /// <param name="clearCache"></param>
/// <returns></returns>
- Task UpdateSetting(Setting setting, bool clearCache = true);
+ Task UpdateSetting(Setting setting);
/// <summary>
/// Deletes a setting
@@ -43,7 +41,7 @@ public interface ISettingService
/// <param name="storeId">Store identifier</param>
/// <param name="defaultValue">Default value</param>
/// <returns>Setting value</returns>
- T GetSettingByKey<T>(string key, T defaultValue = default, string storeId = "");
+ Task<T> GetSettingByKey<T>(string key, T defaultValue = default, string storeId = "");
/// <summary>
/// Set setting value
@@ -52,8 +50,7 @@ public interface ISettingService
/// <param name="key">Key</param>
/// <param name="value">Value</param>
/// <param name="storeId">Store identifier</param>
- /// <param name="clearCache">A value indicating whether to clear cache after setting update</param>
- Task SetSetting<T>(string key, T value, string storeId = "", bool clearCache = true);
+ Task SetSetting<T>(string key, T value, string storeId = "");
/// <summary>
/// Gets all settings
@@ -66,7 +63,7 @@ public interface ISettingService
/// </summary>
/// <typeparam name="T">Type</typeparam>
/// <param name="storeId">Store identifier for which settings should be loaded</param>
- T LoadSetting<T>(string storeId = "") where T : ISettings, new();
+ Task<T> LoadSetting<T>(string storeId = "") where T : ISettings, new();
/// <summary>
/// Load settings
diff --git a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
index d3bba65ad..7622e535e 100644
--- a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
@@ -155,19 +155,18 @@ public class AmazonPictureService : PictureService
/// </summary>
/// <param name="thumbFileName">Thumb file name</param>
/// <returns>Result</returns>
- private Task<bool> GeneratedThumbExists(string thumbFileName)
+ private async Task<bool> GeneratedThumbExists(string thumbFileName)
{
try
{
- var getObjectResponse = _s3Client.GetObjectAsync(_bucketName, thumbFileName).GetAwaiter().GetResult();
+ var getObjectResponse = await _s3Client.GetObjectAsync(_bucketName, thumbFileName);
EnsureValidResponse(getObjectResponse, HttpStatusCode.OK);
- return Task.FromResult(
- getObjectResponse.BucketName == _bucketName || getObjectResponse.Key == thumbFileName);
+ return getObjectResponse.BucketName == _bucketName || getObjectResponse.Key == thumbFileName;
}
catch
{
- return Task.FromResult(false);
+ return false;
}
}
diff --git a/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs b/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs
index 0afcd2d12..068520fce 100644
--- a/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs
+++ b/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs
@@ -3,14 +3,14 @@ namespace Grand.Infrastructure.Caching;
/// <summary>
/// Cache manager interface
/// </summary>
-public interface ICacheBase : IDisposable
+public interface ICacheBase
{
+ T Get<T>(string key, Func<T> acquire);
+ T Get<T>(string key, Func<T> acquire, int cacheTime);
Task<T> GetAsync<T>(string key, Func<Task<T>> acquire);
Task<T> GetAsync<T>(string key, Func<Task<T>> acquire, int cacheTime);
Task<T> SetAsync<T>(string key, Func<Task<T>> acquire);
Task<T> SetAsync<T>(string key, Func<Task<T>> acquire, int cacheTime);
- T Get<T>(string key, Func<T> acquire);
- T Get<T>(string key, Func<T> acquire, int cacheTime);
Task RemoveAsync(string key, bool publisher = true);
Task RemoveByPrefix(string prefix, bool publisher = true);
Task Clear(bool publisher = true);
diff --git a/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs b/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
index 3b1d12f3b..9e9779c73 100644
--- a/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
+++ b/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
@@ -29,7 +29,6 @@ public class MemoryCacheBase : ICacheBase
private readonly IMediator _mediator;
private readonly CacheConfig _cacheConfig;
- private bool _disposed;
private static CancellationTokenSource _resetCacheToken = new();
protected readonly ConcurrentDictionary<string, SemaphoreSlim> CacheEntries = new();
@@ -38,21 +37,21 @@ public class MemoryCacheBase : ICacheBase
#region Methods
- public virtual Task<T> GetAsync<T>(string key, Func<Task<T>> acquire)
+ public virtual T Get<T>(string key, Func<T> acquire)
{
- return GetAsync(key, acquire, _cacheConfig.DefaultCacheTimeMinutes);
+ return Get(key, acquire, _cacheConfig.DefaultCacheTimeMinutes);
}
- public virtual async Task<T> GetAsync<T>(string key, Func<Task<T>> acquire, int cacheTime)
+ public virtual T Get<T>(string key, Func<T> acquire, int cacheTime)
{
if (_cache.TryGetValue(key, out T cacheEntry)) return cacheEntry;
var semaphore = CacheEntries.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
- await semaphore.WaitAsync();
+ semaphore.Wait();
try
{
if (!_cache.TryGetValue(key, out cacheEntry))
{
- cacheEntry = await acquire();
+ cacheEntry = acquire();
_cache.Set(key, cacheEntry, GetMemoryCacheEntryOptions(cacheTime));
}
}
@@ -64,51 +63,51 @@ public class MemoryCacheBase : ICacheBase
return cacheEntry;
}
- public virtual Task<T> SetAsync<T>(string key, Func<Task<T>> acquire)
+ public virtual Task<T> GetAsync<T>(string key, Func<Task<T>> acquire)
{
- return SetAsync(key, acquire, _cacheConfig.DefaultCacheTimeMinutes);
+ return GetAsync(key, acquire, _cacheConfig.DefaultCacheTimeMinutes);
}
- public virtual async Task<T> SetAsync<T>(string key, Func<Task<T>> acquire, int cacheTime)
+ public virtual async Task<T> GetAsync<T>(string key, Func<Task<T>> acquire, int cacheTime)
{
+ if (_cache.TryGetValue(key, out T cacheEntry)) return cacheEntry;
var semaphore = CacheEntries.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
await semaphore.WaitAsync();
try
{
- var cacheEntry = await acquire();
- _cache.Set(key, cacheEntry, GetMemoryCacheEntryOptions(cacheTime));
- return cacheEntry;
+ if (!_cache.TryGetValue(key, out cacheEntry))
+ {
+ cacheEntry = await acquire();
+ _cache.Set(key, cacheEntry, GetMemoryCacheEntryOptions(cacheTime));
+ }
}
finally
{
semaphore.Release();
}
+
+ return cacheEntry;
}
- public virtual T Get<T>(string key, Func<T> acquire)
+ public virtual Task<T> SetAsync<T>(string key, Func<Task<T>> acquire)
{
- return Get(key, acquire, _cacheConfig.DefaultCacheTimeMinutes);
+ return SetAsync(key, acquire, _cacheConfig.DefaultCacheTimeMinutes);
}
- public virtual T Get<T>(string key, Func<T> acquire, int cacheTime)
+ public virtual async Task<T> SetAsync<T>(string key, Func<Task<T>> acquire, int cacheTime)
{
- if (_cache.TryGetValue(key, out T cacheEntry)) return cacheEntry;
var semaphore = CacheEntries.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
- semaphore.Wait();
+ await semaphore.WaitAsync();
try
{
- if (!_cache.TryGetValue(key, out cacheEntry))
- {
- cacheEntry = acquire();
- _cache.Set(key, cacheEntry, GetMemoryCacheEntryOptions(cacheTime));
- }
+ var cacheEntry = await acquire();
+ _cache.Set(key, cacheEntry, GetMemoryCacheEntryOptions(cacheTime));
+ return cacheEntry;
}
finally
{
semaphore.Release();
}
-
- return cacheEntry;
}
public virtual Task RemoveAsync(string key, bool publisher = true)
@@ -148,24 +147,6 @@ public class MemoryCacheBase : ICacheBase
return Task.CompletedTask;
}
- ~MemoryCacheBase()
- {
- Dispose(false);
- }
-
- public void Dispose()
- {
- Dispose(true);
- GC.SuppressFinalize(this);
- }
-
- protected virtual void Dispose(bool disposing)
- {
- if (_disposed) return;
- if (disposing) _cache.Dispose();
- _disposed = true;
- }
-
#endregion
#region Utilities
diff --git a/src/Core/Grand.Infrastructure/Caching/RabbitMq/CacheMessageEventConsumer.cs b/src/Core/Grand.Infrastructure/Caching/RabbitMq/CacheMessageEventConsumer.cs
deleted file mode 100644
index d51f7aa11..000000000
--- a/src/Core/Grand.Infrastructure/Caching/RabbitMq/CacheMessageEventConsumer.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Grand.Infrastructure.Caching.Message;
-using MassTransit;
-
-namespace Grand.Infrastructure.Caching.RabbitMq;
-
-public class CacheMessageEventConsumer : IConsumer<CacheMessageEvent>
-{
- private readonly ICacheBase _cache;
-
- public CacheMessageEventConsumer(ICacheBase cache)
- {
- _cache = cache;
- }
-
- public async Task Consume(ConsumeContext<CacheMessageEvent> context)
- {
- var message = context.Message;
- if (RabbitMqMessageCacheManager.ManageClientId.Equals(message.ClientId)) return;
- switch (message.MessageType)
- {
- case (int)MessageEventType.RemoveKey:
- await _cache.RemoveAsync(message.Key, false);
- break;
- case (int)MessageEventType.RemoveByPrefix:
- await _cache.RemoveByPrefix(message.Key, false);
- break;
- case (int)MessageEventType.ClearCache:
- await _cache.Clear(false);
- break;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs b/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs
deleted file mode 100644
index a61af9429..000000000
--- a/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Grand.Infrastructure.Caching.Message;
-using Grand.Infrastructure.Configuration;
-using MassTransit;
-using MediatR;
-using Microsoft.Extensions.Caching.Memory;
-
-namespace Grand.Infrastructure.Caching.RabbitMq;
-
-public class RabbitMqMessageCacheManager : MemoryCacheBase, ICacheBase
-{
- public static readonly string ManageClientId = Guid.NewGuid().ToString("N");
- private readonly IBus _bus;
- private readonly IMemoryCache _cache;
-
- public RabbitMqMessageCacheManager(IMemoryCache cache, IMediator mediator, IBus bus, CacheConfig config)
- : base(cache, mediator, config)
- {
- _cache = cache;
- _bus = bus;
- }
-
- /// <summary>
- /// Removes the value with the specified key from the cache
- /// </summary>
- /// <param name="key">Key of cached item</param>
- /// <param name="publisher">Publisher</param>
- public override async Task RemoveAsync(string key, bool publisher = true)
- {
- _cache.Remove(key);
-
- if (publisher)
- await _bus.Publish(new CacheMessageEvent
- { ClientId = ManageClientId, Key = key, MessageType = (int)MessageEventType.RemoveKey });
- }
-
- /// <summary>
- /// Removes items by key prefix
- /// </summary>
- /// <param name="prefix">String prefix</param>
- /// <param name="publisher">publisher</param>
- public override async Task RemoveByPrefix(string prefix, bool publisher = true)
- {
- var entriesToRemove = CacheEntries.Where(x => x.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
- foreach (var cacheEntries in entriesToRemove) _cache.Remove(cacheEntries.Key);
-
- if (publisher)
- await _bus.Publish(new CacheMessageEvent
- { ClientId = ManageClientId, Key = prefix, MessageType = (int)MessageEventType.RemoveByPrefix });
- }
-
- /// <summary>
- /// Clear cache
- /// </summary>
- /// <param name="publisher">publisher</param>
- public override async Task Clear(bool publisher = true)
- {
- await base.Clear();
- if (publisher)
- await _bus.Publish(new CacheMessageEvent
- { ClientId = ManageClientId, Key = "", MessageType = (int)MessageEventType.ClearCache });
- }
-}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/Configuration/RabbitConfig.cs b/src/Core/Grand.Infrastructure/Configuration/RabbitConfig.cs
deleted file mode 100644
index 5bd66c220..000000000
--- a/src/Core/Grand.Infrastructure/Configuration/RabbitConfig.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Grand.Infrastructure.Configuration;
-
-public class RabbitConfig
-{
- public bool RabbitEnabled { get; set; }
- public bool RabbitCachePubSubEnabled { get; set; }
- public string RabbitHostName { get; set; }
- public string RabbitVirtualHost { get; set; }
- public string RabbitUsername { get; set; }
- public string RabbitPassword { get; set; }
- public string RabbitCacheReceiveEndpoint { get; set; }
-}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj
index 072467ff0..1692b4d48 100644
--- a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj
+++ b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj
@@ -3,9 +3,7 @@
<ItemGroup>
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" />
<PackageReference Include="GoogleAuthenticator" />
- <PackageReference Include="MassTransit" />
- <PackageReference Include="MassTransit.RabbitMQ" />
- <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
+ <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.cs
index 11a4af331..9aa83ab2a 100644
--- a/src/Core/Grand.Infrastructure/StartupBase.cs
+++ b/src/Core/Grand.Infrastructure/StartupBase.cs
@@ -1,6 +1,5 @@
using AutoMapper;
using Grand.Data;
-using Grand.Infrastructure.Caching.RabbitMq;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Extensions;
using Grand.Infrastructure.Mapper;
@@ -12,7 +11,6 @@ using Grand.Infrastructure.TypeSearch;
using Grand.Infrastructure.Validators;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
-using MassTransit;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
@@ -163,40 +161,7 @@ public static class StartupBase
});
}
}
-
- /// <summary>
- /// Add Mass Transit rabbitmq message broker
- /// </summary>
- /// <param name="services"></param>
- /// <param name="configuration"></param>
- /// <param name="typeSearcher"></param>
- private static void AddMassTransitRabbitMq(IServiceCollection services, IConfiguration configuration,
- ITypeSearcher typeSearcher)
- {
- var config = new RabbitConfig();
- configuration.GetSection("Rabbit").Bind(config);
-
- if (!config.RabbitEnabled) return;
- services.AddMassTransit(x =>
- {
- x.AddConsumers(q => q != typeof(CacheMessageEventConsumer), typeSearcher.GetAssemblies().ToArray());
-
- if (config.RabbitCachePubSubEnabled)
- x.AddConsumer<CacheMessageEventConsumer>()
- .Endpoint(t => t.Name = config.RabbitCacheReceiveEndpoint);
-
- x.UsingRabbitMq((context, cfg) =>
- {
- cfg.Host(config.RabbitHostName, config.RabbitVirtualHost, h =>
- {
- h.Password(config.RabbitPassword);
- h.Username(config.RabbitUsername);
- });
- cfg.ConfigureEndpoints(context);
- });
- });
- }
-
+
/// <summary>
/// Register application
/// </summary>
@@ -257,7 +222,6 @@ public static class StartupBase
services.StartupConfig<AccessControlConfig>(configuration.GetSection("AccessControl"));
services.StartupConfig<UrlRewriteConfig>(configuration.GetSection("UrlRewrite"));
services.StartupConfig<RedisConfig>(configuration.GetSection("Redis"));
- services.StartupConfig<RabbitConfig>(configuration.GetSection("Rabbit"));
services.StartupConfig<BackendAPIConfig>(configuration.GetSection("BackendAPI"));
services.StartupConfig<FrontendAPIConfig>(configuration.GetSection("FrontendAPI"));
services.StartupConfig<DatabaseConfig>(configuration.GetSection("Database"));
@@ -317,9 +281,6 @@ public static class StartupBase
//add mediator
AddMediator(services, typeSearcher);
- //Add MassTransit
- AddMassTransitRabbitMq(services, configuration, typeSearcher);
-
//Register startup
var instancesAfter = startupConfigurations
.Where(PluginExtensions.OnlyInstalledPlugins)
diff --git a/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs b/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
index 2d529d9fd..a7ae30271 100644
--- a/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
+++ b/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
@@ -54,7 +54,7 @@ public class PaymentCashOnDeliveryController : BasePaymentController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore(_storeService, _workContextAccessor.WorkContext);
- var cashOnDeliveryPaymentSettings = _settingService.LoadSetting<CashOnDeliveryPaymentSettings>(storeScope);
+ var cashOnDeliveryPaymentSettings = await _settingService.LoadSetting<CashOnDeliveryPaymentSettings>(storeScope);
var model = new ConfigurationModel {
DescriptionText = cashOnDeliveryPaymentSettings.DescriptionText,
@@ -79,7 +79,7 @@ public class PaymentCashOnDeliveryController : BasePaymentController
//load settings for a chosen store scope
var storeScope = await GetActiveStore(_storeService, _workContextAccessor.WorkContext);
- var cashOnDeliveryPaymentSettings = _settingService.LoadSetting<CashOnDeliveryPaymentSettings>(storeScope);
+ var cashOnDeliveryPaymentSettings = await _settingService.LoadSetting<CashOnDeliveryPaymentSettings>(storeScope);
//save settings
cashOnDeliveryPaymentSettings.DescriptionText = model.DescriptionText;
diff --git a/src/Plugins/Payments.CashOnDelivery/Controllers/PaymentCashOnDeliveryController.cs b/src/Plugins/Payments.CashOnDelivery/Controllers/PaymentCashOnDeliveryController.cs
index 486fdf8f3..f340757cc 100644
--- a/src/Plugins/Payments.CashOnDelivery/Controllers/PaymentCashOnDeliveryController.cs
+++ b/src/Plugins/Payments.CashOnDelivery/Controllers/PaymentCashOnDeliveryController.cs
@@ -19,10 +19,9 @@ public class PaymentCashOnDeliveryController : BasePaymentController
_settingService = settingService;
}
- public IActionResult PaymentInfo()
+ public async Task<IActionResult> PaymentInfo()
{
- var cashOnDeliveryPaymentSettings =
- _settingService.LoadSetting<CashOnDeliveryPaymentSettings>(_workContextAccessor.WorkContext.CurrentStore.Id);
+ var cashOnDeliveryPaymentSettings = await _settingService.LoadSetting<CashOnDeliveryPaymentSettings>(_workContextAccessor.WorkContext.CurrentStore.Id);
var model = new PaymentInfoModel {
DescriptionText = cashOnDeliveryPaymentSettings.DescriptionText
diff --git a/src/Plugins/Payments.StripeCheckout/Areas/Admin/Controllers/StripeCheckoutController.cs b/src/Plugins/Payments.StripeCheckout/Areas/Admin/Controllers/StripeCheckoutController.cs
index ae8ed2ad1..07a16723b 100644
--- a/src/Plugins/Payments.StripeCheckout/Areas/Admin/Controllers/StripeCheckoutController.cs
+++ b/src/Plugins/Payments.StripeCheckout/Areas/Admin/Controllers/StripeCheckoutController.cs
@@ -59,7 +59,7 @@ public class StripeCheckoutController : BasePaymentController
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var stripeCheckoutPaymentSettings = _settingService.LoadSetting<StripeCheckoutPaymentSettings>(storeScope);
+ var stripeCheckoutPaymentSettings = await _settingService.LoadSetting<StripeCheckoutPaymentSettings>(storeScope);
var model = new ConfigurationModel {
ApiKey = stripeCheckoutPaymentSettings.ApiKey,
@@ -84,7 +84,7 @@ public class StripeCheckoutController : BasePaymentController
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var stripeCheckoutPaymentSettings = _settingService.LoadSetting<StripeCheckoutPaymentSettings>(storeScope);
+ var stripeCheckoutPaymentSettings = await _settingService.LoadSetting<StripeCheckoutPaymentSettings>(storeScope);
//save settings
stripeCheckoutPaymentSettings.ApiKey = model.ApiKey;
diff --git a/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs b/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
index 60b5ab8cc..0455f5af8 100644
--- a/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
@@ -44,7 +44,7 @@ public class ShippingFixedRateController : BaseShippingController
rateModels.Add(new FixedShippingRateModel {
ShippingMethodId = shippingMethod.Id,
ShippingMethodName = shippingMethod.Name,
- Rate = GetShippingRate(shippingMethod.Id)
+ Rate = await GetShippingRate(shippingMethod.Id)
});
var gridModel = new DataSourceResult {
@@ -67,17 +67,15 @@ public class ShippingFixedRateController : BaseShippingController
Rate = model.Rate
};
- await _settingService.SetSetting(
- $"ShippingRateComputationMethod.FixedRate.Rate.ShippingMethodId{shippingMethodId}", rate);
+ await _settingService.SetSetting($"ShippingRateComputationMethod.FixedRate.Rate.ShippingMethodId{shippingMethodId}", rate);
return new JsonResult("");
}
[NonAction]
- private double GetShippingRate(string shippingMethodId)
+ private async Task<double> GetShippingRate(string shippingMethodId)
{
- var rate = _settingService.GetSettingByKey<FixedShippingRate>(
- $"ShippingRateComputationMethod.FixedRate.Rate.ShippingMethodId{shippingMethodId}")?.Rate;
+ var rate = (await _settingService.GetSettingByKey<FixedShippingRate>($"ShippingRateComputationMethod.FixedRate.Rate.ShippingMethodId{shippingMethodId}"))?.Rate;
return rate ?? 0;
}
}
\ No newline at end of file
diff --git a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
index bf3f9dad4..69a7a2ecc 100644
--- a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
@@ -70,7 +70,7 @@ public class FixedRateShippingProvider : IShippingRateCalculationProvider
var shippingOption = new ShippingOption {
Name = shippingMethod.GetTranslation(x => x.Name, _workContextAccessor.WorkContext.WorkingLanguage.Id),
Description = shippingMethod.GetTranslation(x => x.Description, _workContextAccessor.WorkContext.WorkingLanguage.Id),
- Rate = await _currencyService.ConvertFromPrimaryStoreCurrency(GetRate(shippingMethod.Id),
+ Rate = await _currencyService.ConvertFromPrimaryStoreCurrency(await GetRate(shippingMethod.Id),
_workContextAccessor.WorkContext.WorkingCurrency)
};
response.ShippingOptions.Add(shippingOption);
@@ -98,7 +98,7 @@ public class FixedRateShippingProvider : IShippingRateCalculationProvider
var rates = new List<double>();
foreach (var shippingMethod in shippingMethods)
{
- var rate = GetRate(shippingMethod.Id);
+ var rate = await GetRate(shippingMethod.Id);
if (!rates.Contains(rate))
rates.Add(rate);
}
@@ -138,10 +138,10 @@ public class FixedRateShippingProvider : IShippingRateCalculationProvider
#region Utilities
- private double GetRate(string shippingMethodId)
+ private async Task<double> GetRate(string shippingMethodId)
{
var key = $"ShippingRateComputationMethod.FixedRate.Rate.ShippingMethodId{shippingMethodId}";
- var rate = _settingService.GetSettingByKey<FixedShippingRate>(key)?.Rate;
+ var rate = (await _settingService.GetSettingByKey<FixedShippingRate>(key))?.Rate;
return rate ?? 0;
}
diff --git a/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs b/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
index 843b0c91e..d3cc999c2 100644
--- a/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
+++ b/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
@@ -35,7 +35,7 @@ public class TaxFixedRateController : BaseAdminPluginController
taxRateModels.Add(new FixedTaxRateModel {
TaxCategoryId = taxCategory.Id,
TaxCategoryName = taxCategory.Name,
- Rate = GetTaxRate(taxCategory.Id)
+ Rate = await GetTaxRate(taxCategory.Id)
});
var gridModel = new DataSourceResult {
@@ -58,10 +58,9 @@ public class TaxFixedRateController : BaseAdminPluginController
}
[NonAction]
- private double GetTaxRate(string taxCategoryId)
+ private async Task<double> GetTaxRate(string taxCategoryId)
{
- var rate = _settingService.GetSettingByKey<FixedTaxRate>(
- $"Tax.TaxProvider.FixedRate.TaxCategoryId{taxCategoryId}")?.Rate;
+ var rate = (await _settingService.GetSettingByKey<FixedTaxRate>($"Tax.TaxProvider.FixedRate.TaxCategoryId{taxCategoryId}"))?.Rate;
return rate ?? 0;
}
}
\ No newline at end of file
diff --git a/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs b/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
index 8bf65a4e4..f12648aa6 100644
--- a/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
+++ b/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
@@ -34,12 +34,12 @@ public class FixedRateTaxProvider : ITaxProvider
/// </summary>
/// <param name="calculateTaxRequest">Tax calculation request</param>
/// <returns>Tax</returns>
- public Task<TaxResult> GetTaxRate(TaxRequest calculateTaxRequest)
+ public async Task<TaxResult> GetTaxRate(TaxRequest calculateTaxRequest)
{
var result = new TaxResult {
- TaxRate = GetTaxRate(calculateTaxRequest.TaxCategoryId)
+ TaxRate = await GetTaxRate(calculateTaxRequest.TaxCategoryId)
};
- return Task.FromResult(result);
+ return result;
}
/// <summary>
@@ -47,10 +47,9 @@ public class FixedRateTaxProvider : ITaxProvider
/// </summary>
/// <param name="taxCategoryId">The tax category identifier</param>
/// <returns>Tax rate</returns>
- private double GetTaxRate(string taxCategoryId)
+ private async Task<double> GetTaxRate(string taxCategoryId)
{
- var rate = _settingService.GetSettingByKey<FixedTaxRate>(
- $"Tax.TaxProvider.FixedRate.TaxCategoryId{taxCategoryId}")?.Rate;
+ var rate = (await _settingService.GetSettingByKey<FixedTaxRate>($"Tax.TaxProvider.FixedRate.TaxCategoryId{taxCategoryId}"))?.Rate;
return rate ?? 0;
}
}
\ No newline at end of file
diff --git a/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs b/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
index 596abaa0c..a9ef544b0 100644
--- a/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
+++ b/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
@@ -51,7 +51,7 @@ public class WidgetsFacebookPixelController : BaseAdminPluginController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore(_storeService, _workContextAccessor.WorkContext);
- var facebookPixelSettings = _settingService.LoadSetting<FacebookPixelSettings>(storeScope);
+ var facebookPixelSettings = await _settingService.LoadSetting<FacebookPixelSettings>(storeScope);
var model = new ConfigurationModel {
PixelId = facebookPixelSettings.PixelId,
PixelScript = facebookPixelSettings.PixelScript,
@@ -72,7 +72,7 @@ public class WidgetsFacebookPixelController : BaseAdminPluginController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore(_storeService, _workContextAccessor.WorkContext);
- var facebookPixelSettings = _settingService.LoadSetting<FacebookPixelSettings>(storeScope);
+ var facebookPixelSettings = await _settingService.LoadSetting<FacebookPixelSettings>(storeScope);
facebookPixelSettings.PixelId = model.PixelId;
facebookPixelSettings.PixelScript = model.PixelScript;
facebookPixelSettings.AddToCartScript = model.AddToCartScript;
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs b/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
index 57997944a..fff93456d 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
@@ -49,7 +49,7 @@ public class WidgetsGoogleAnalyticsController : BaseAdminPluginController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore(_storeService, _workContextAccessor.WorkContext);
- var googleAnalyticsSettings = _settingService.LoadSetting<GoogleAnalyticsEcommerceSettings>(storeScope);
+ var googleAnalyticsSettings = await _settingService.LoadSetting<GoogleAnalyticsEcommerceSettings>(storeScope);
var model = new ConfigurationModel {
GoogleId = googleAnalyticsSettings.GoogleId,
TrackingScript = googleAnalyticsSettings.TrackingScript,
@@ -71,7 +71,7 @@ public class WidgetsGoogleAnalyticsController : BaseAdminPluginController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore(_storeService, _workContextAccessor.WorkContext);
- var googleAnalyticsSettings = _settingService.LoadSetting<GoogleAnalyticsEcommerceSettings>(storeScope);
+ var googleAnalyticsSettings = await _settingService.LoadSetting<GoogleAnalyticsEcommerceSettings>(storeScope);
googleAnalyticsSettings.GoogleId = model.GoogleId;
googleAnalyticsSettings.TrackingScript = model.TrackingScript;
googleAnalyticsSettings.EcommerceScript = model.EcommerceScript;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs
index dd2c30ced..a3753949a 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs
@@ -30,7 +30,7 @@ public class GetPriceByCustomerProductQueryHandlerTests
public async Task HandleTest()
{
await handler.Handle(new GetPriceByCustomerProductQuery(), CancellationToken.None);
- _casheManagerMock.Verify(c => c.Get(It.IsAny<string>(), It.IsAny<Func<(CustomerProductPrice, bool)>>()),
+ _casheManagerMock.Verify(c => c.GetAsync(It.IsAny<string>(), It.IsAny<Func<Task<CustomerProductPrice>>>()),
Times.Once);
}
}
\ No newline at end of file
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
index fd7e84717..bd8776036 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
@@ -42,28 +42,28 @@ public class PaymentServiceTests
}
[TestMethod]
- public void GetRestrictedCountryIds()
+ public async Task GetRestrictedCountryIds()
{
_paymentProviderMock.Setup(c => c.SystemName).Returns("systemName");
var expectedResult = new List<string> { "1", "2", "3", "4" };
var expectedKey = "PaymentMethodRestictions.systemName";
_settingService.Setup(s => s.GetSettingByKey<PaymentRestrictedSettings>(It.IsAny<string>(), null, ""))
- .Returns(() => new PaymentRestrictedSettings { Ids = expectedResult });
+ .Returns(() => Task.FromResult(new PaymentRestrictedSettings { Ids = expectedResult }));
- var result = _paymentService.GetRestrictedCountryIds(_paymentProviderMock.Object);
+ var result = await _paymentService.GetRestrictedCountryIds(_paymentProviderMock.Object);
Assert.IsTrue(expectedResult.SequenceEqual(result));
_settingService.Verify(s => s.GetSettingByKey<PaymentRestrictedSettings>(expectedKey, null, ""), Times.Once);
}
[TestMethod]
- public void GetRestrictedCountryIds_ReturnEmptyList()
+ public async Task GetRestrictedCountryIds_ReturnEmptyList()
{
_paymentProviderMock.Setup(c => c.SystemName).Returns("systemName");
var expectedKey = "PaymentMethodRestictions.systemName";
_settingService.Setup(s => s.GetSettingByKey<PaymentRestrictedSettings>(It.IsAny<string>(), null, ""))
- .Returns(() => null);
+ .Returns(() => Task.FromResult((PaymentRestrictedSettings)null));
- var result = _paymentService.GetRestrictedCountryIds(_paymentProviderMock.Object);
+ var result = await _paymentService.GetRestrictedCountryIds(_paymentProviderMock.Object);
Assert.IsTrue(result.Count == 0);
_settingService.Verify(s => s.GetSettingByKey<PaymentRestrictedSettings>(expectedKey, null, ""), Times.Once);
}
@@ -77,7 +77,7 @@ public class PaymentServiceTests
await _paymentService.SaveRestrictedCountryIds(_paymentProviderMock.Object, countryIds);
_settingService.Verify(
- s => s.SetSetting(expectedKey, It.IsAny<PaymentRestrictedSettings>(), It.IsAny<string>(), It.IsAny<bool>()),
+ s => s.SetSetting(expectedKey, It.IsAny<PaymentRestrictedSettings>(), It.IsAny<string>()),
Times.Once);
}
diff --git a/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs b/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs
index 9ba5e0f86..3b0afff2e 100644
--- a/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs
+++ b/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs
@@ -29,39 +29,38 @@ public class MemoryCacheBaseTests
_mediatorMock = new Mock<IMediator>();
_service = new MemoryCacheBase(_memoryCache, _mediatorMock.Object, _config);
}
-
[TestMethod]
- public async Task GetAsyncTest()
+ public void GetTest()
{
- var result = await _service.GetAsync("key", () => { return Task.FromResult("test"); });
+ var result = _service.Get("key", () => { return "test"; });
Assert.AreEqual(result, "test");
}
[TestMethod]
- public async Task GetAsyncTest_CacheTimeMinutes()
+ public void GetTest_CacheTimeMinutes()
{
- var result = await _service.GetAsync("key", () => { return Task.FromResult("test"); }, 1);
+ var result = _service.Get("key", () => { return "test"; }, 1);
Assert.AreEqual(result, "test");
}
[TestMethod]
- public void GetTest()
+ public async Task GetAsyncTest()
{
- var result = _service.Get("key", () => { return "test"; });
+ var result = await _service.GetAsync("key", () => { return Task.FromResult("test"); });
Assert.AreEqual(result, "test");
}
[TestMethod]
- public void GetTest_CacheTimeMinutes()
+ public async Task GetAsyncTest_CacheTimeMinutes()
{
- var result = _service.Get("key", () => { return "test"; }, 1);
+ var result = await _service.GetAsync("key", () => { return Task.FromResult("test"); }, 1);
Assert.AreEqual(result, "test");
}
[TestMethod]
public async Task RemoveAsyncTest_IsNull()
{
- _service.Get("key", () => { return "test"; }, 1);
+ await _service.GetAsync("key", () => { return Task.FromResult("test"); }, 1);
await _service.RemoveAsync("key");
var result = _memoryCache.Get("key");
Assert.IsNull(result);
@@ -70,7 +69,7 @@ public class MemoryCacheBaseTests
[TestMethod]
public async Task RemoveAsyncTest_NotNull()
{
- _service.Get("key", () => { return "test"; }, 1);
+ await _service.GetAsync("key", () => { return Task.FromResult("test"); }, 1);
await _service.RemoveAsync("key1");
var result = _memoryCache.Get("key");
Assert.IsNotNull(result);
@@ -79,9 +78,9 @@ public class MemoryCacheBaseTests
[TestMethod]
public async Task RemoveByPrefixTest()
{
- _service.Get("key1", () => { return "test"; }, 1);
- _service.Get("key2", () => { return "test"; }, 1);
- _service.Get("test", () => { return "test"; }, 1);
+ await _service.GetAsync("key1", () => { return Task.FromResult("test"); }, 1);
+ await _service.GetAsync("key2", () => { return Task.FromResult("test"); }, 1);
+ await _service.GetAsync("test", () => { return Task.FromResult("test"); }, 1);
await _service.RemoveByPrefix("key");
var result = _memoryCache.Get("key1");
Assert.IsNull(result);
@@ -90,9 +89,9 @@ public class MemoryCacheBaseTests
[TestMethod]
public async Task ClearTest()
{
- _service.Get("key1", () => { return "test"; }, 1);
- _service.Get("key2", () => { return "test"; }, 1);
- _service.Get("test", () => { return "test"; }, 1);
+ await _service.GetAsync("key1", () => { return Task.FromResult("test"); }, 1);
+ await _service.GetAsync("key2", () => { return Task.FromResult("test"); }, 1);
+ await _service.GetAsync("test", () => { return Task.FromResult("test"); }, 1);
await _service.Clear();
var result = _memoryCache.Get("key1");
Assert.IsNull(result);
@@ -129,7 +128,7 @@ public class MemoryCacheBaseTests
var acquireMock = new Mock<Func<Task<string>>>();
acquireMock.Setup(a => a.Invoke()).ReturnsAsync(cacheEntry);
- _service.Get(key, () => { return "fakeValue"; }, 1);
+ await _service.GetAsync(key, () => { return Task.FromResult("fakeValue"); }, 1);
// Act
var result = await _service.SetAsync(key, acquireMock.Object, cacheTime);
diff --git a/src/Web/Grand.Web.Admin/App_Data/appsettings.json b/src/Web/Grand.Web.Admin/App_Data/appsettings.json
index 898c13214..bc8dc4e2a 100644
--- a/src/Web/Grand.Web.Admin/App_Data/appsettings.json
+++ b/src/Web/Grand.Web.Admin/App_Data/appsettings.json
@@ -122,17 +122,6 @@
"PersistKeysToRedis": false,
"PersistKeysToRedisUrl": "127.0.0.1:6379,allowAdmin=true,defaultDatabase=1"
},
- "Rabbit": {
- //Enable RabbitMq
- "RabbitEnabled": false,
- "RabbitCachePubSubEnabled": false,
- "RabbitHostName": "localhost",
- "RabbitVirtualHost": "/",
- "RabbitUsername": "guest",
- "RabbitPassword": "guest",
- //must be unique for each instance
- "RabbitCacheReceiveEndpoint": "grandnode"
- },
"UrlRewrite": {
//Load url rewrite rules from external file AppData/UrlRewrite.xml
"UseUrlRewrite": false,
diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
index 8460d9e2c..e9cbfce20 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
@@ -67,10 +67,10 @@ public class PaymentController : BaseAdminController
{
var storeScope = await GetActiveStore();
- var _paymentSettings = _settingService.LoadSetting<PaymentSettings>(storeScope);
+ var _paymentSettings = await _settingService.LoadSetting<PaymentSettings>(storeScope);
var paymentMethodsModel = new List<PaymentMethodModel>();
- var paymentMethods = _paymentService.LoadAllPaymentMethods();
+ var paymentMethods = await _paymentService.LoadAllPaymentMethods();
foreach (var paymentMethod in paymentMethods)
{
var tmp = await paymentMethod.ToModel();
@@ -103,7 +103,7 @@ public class PaymentController : BaseAdminController
public async Task<IActionResult> MethodUpdate(PaymentMethodModel model)
{
var storeScope = await GetActiveStore();
- var _paymentSettings = _settingService.LoadSetting<PaymentSettings>(storeScope);
+ var _paymentSettings = await _settingService.LoadSetting<PaymentSettings>(storeScope);
var pm = _paymentService.LoadPaymentMethodBySystemName(model.SystemName);
if (pm.IsPaymentMethodActive(_paymentSettings))
@@ -147,7 +147,7 @@ public class PaymentController : BaseAdminController
public async Task<IActionResult> MethodRestrictions()
{
var model = new PaymentMethodRestrictionModel();
- var paymentMethods = _paymentService.LoadAllPaymentMethods();
+ var paymentMethods = await _paymentService.LoadAllPaymentMethods();
var countries = await _countryService.GetAllCountries(showHidden: true);
var shippings = await _shippingMethodService.GetAllShippingMethods();
@@ -161,7 +161,7 @@ public class PaymentController : BaseAdminController
foreach (var pm in paymentMethods)
{
- var restictedCountries = _paymentService.GetRestrictedCountryIds(pm);
+ var restictedCountries = await _paymentService.GetRestrictedCountryIds(pm);
foreach (var c in countries)
{
var resticted = restictedCountries.Contains(c.Id);
@@ -170,7 +170,7 @@ public class PaymentController : BaseAdminController
model.Resticted[pm.SystemName][c.Id] = resticted;
}
- var restictedShipping = _paymentService.GetRestrictedShippingIds(pm);
+ var restictedShipping = await _paymentService.GetRestrictedShippingIds(pm);
foreach (var s in shippings)
{
var resticted = restictedShipping.Contains(s.Name);
@@ -188,7 +188,7 @@ public class PaymentController : BaseAdminController
[RequestFormLimits(ValueCountLimit = 2048)]
public async Task<IActionResult> MethodRestrictionsSave(IDictionary<string, string[]> model)
{
- var paymentMethods = _paymentService.LoadAllPaymentMethods();
+ var paymentMethods = await _paymentService.LoadAllPaymentMethods();
var countries = await _countryService.GetAllCountries(showHidden: true);
var shippings = await _shippingMethodService.GetAllShippingMethods();
@@ -230,7 +230,7 @@ public class PaymentController : BaseAdminController
{
var storeScope = await GetActiveStore();
- var paymentSettings = _settingService.LoadSetting<PaymentSettings>(storeScope);
+ var paymentSettings = await _settingService.LoadSetting<PaymentSettings>(storeScope);
var model = paymentSettings.ToModel();
return View(model);
@@ -241,7 +241,7 @@ public class PaymentController : BaseAdminController
{
var storeScope = await GetActiveStore();
- var paymentSettings = _settingService.LoadSetting<PaymentSettings>(storeScope);
+ var paymentSettings = await _settingService.LoadSetting<PaymentSettings>(storeScope);
paymentSettings = model.ToEntity(paymentSettings);
await _settingService.SaveSetting(paymentSettings, storeScope);
diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
index 9543d8443..3d2045acb 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
@@ -70,9 +70,9 @@ public class SettingController(
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var blogSettings = settingService.LoadSetting<BlogSettings>(storeScope);
- var newsSettings = settingService.LoadSetting<NewsSettings>(storeScope);
- var knowledgebaseSettings = settingService.LoadSetting<KnowledgebaseSettings>(storeScope);
+ var blogSettings = await settingService.LoadSetting<BlogSettings>(storeScope);
+ var newsSettings = await settingService.LoadSetting<NewsSettings>(storeScope);
+ var knowledgebaseSettings = await settingService.LoadSetting<KnowledgebaseSettings>(storeScope);
var model = new ContentSettingsModel {
BlogSettings = blogSettings.ToModel(),
NewsSettings = newsSettings.ToModel(),
@@ -88,17 +88,17 @@ public class SettingController(
{
var storeScope = await GetActiveStore();
//blog
- var blogSettings = settingService.LoadSetting<BlogSettings>(storeScope);
+ var blogSettings = await settingService.LoadSetting<BlogSettings>(storeScope);
blogSettings = model.BlogSettings.ToEntity(blogSettings);
await settingService.SaveSetting(blogSettings, storeScope);
//news
- var newsSettings = settingService.LoadSetting<NewsSettings>(storeScope);
+ var newsSettings = await settingService.LoadSetting<NewsSettings>(storeScope);
newsSettings = model.NewsSettings.ToEntity(newsSettings);
await settingService.SaveSetting(newsSettings, storeScope);
//knowledgebase
- var knowledgeBaseSettings = settingService.LoadSetting<KnowledgebaseSettings>(storeScope);
+ var knowledgeBaseSettings = await settingService.LoadSetting<KnowledgebaseSettings>(storeScope);
knowledgeBaseSettings = model.KnowledgebaseSettings.ToEntity(knowledgeBaseSettings);
await settingService.SaveSetting(knowledgeBaseSettings, storeScope);
@@ -116,7 +116,7 @@ public class SettingController(
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var vendorSettings = settingService.LoadSetting<VendorSettings>(storeScope);
+ var vendorSettings = await settingService.LoadSetting<VendorSettings>(storeScope);
var model = vendorSettings.ToModel();
model.ActiveStore = storeScope;
@@ -129,7 +129,7 @@ public class SettingController(
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var vendorSettings = settingService.LoadSetting<VendorSettings>(storeScope);
+ var vendorSettings = await settingService.LoadSetting<VendorSettings>(storeScope);
vendorSettings = model.ToEntity(vendorSettings);
await settingService.SaveSetting(vendorSettings, storeScope);
@@ -145,7 +145,7 @@ public class SettingController(
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var catalogSettings = settingService.LoadSetting<CatalogSettings>(storeScope);
+ var catalogSettings = await settingService.LoadSetting<CatalogSettings>(storeScope);
var model = catalogSettings.ToModel();
model.ActiveStore = storeScope;
return View(model);
@@ -156,7 +156,7 @@ public class SettingController(
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var catalogSettings = settingService.LoadSetting<CatalogSettings>(storeScope);
+ var catalogSettings = await settingService.LoadSetting<CatalogSettings>(storeScope);
catalogSettings = model.ToEntity(catalogSettings);
await settingService.SaveSetting(catalogSettings, storeScope);
@@ -178,7 +178,7 @@ public class SettingController(
public async Task<IActionResult> SortOptionsList(DataSourceRequest command)
{
var storeScope = await GetActiveStore();
- var catalogSettings = settingService.LoadSetting<CatalogSettings>(storeScope);
+ var catalogSettings = await settingService.LoadSetting<CatalogSettings>(storeScope);
var model = new List<SortOptionModel>();
foreach (int option in Enum.GetValues(typeof(ProductSortingEnum)))
model.Add(new SortOptionModel {
@@ -200,7 +200,7 @@ public class SettingController(
public async Task<IActionResult> SortOptionUpdate(SortOptionModel model)
{
var storeScope = await GetActiveStore();
- var catalogSettings = settingService.LoadSetting<CatalogSettings>(storeScope);
+ var catalogSettings = await settingService.LoadSetting<CatalogSettings>(storeScope);
catalogSettings.ProductSortingEnumDisplayOrder[model.Id] = model.DisplayOrder;
switch (model.IsActive)
@@ -226,9 +226,9 @@ public class SettingController(
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var loyaltyPointsSettings = settingService.LoadSetting<LoyaltyPointsSettings>(storeScope);
- var orderSettings = settingService.LoadSetting<OrderSettings>(storeScope);
- var shoppingCartSettings = settingService.LoadSetting<ShoppingCartSettings>(storeScope);
+ var loyaltyPointsSettings = await settingService.LoadSetting<LoyaltyPointsSettings>(storeScope);
+ var orderSettings = await settingService.LoadSetting<OrderSettings>(storeScope);
+ var shoppingCartSettings = await settingService.LoadSetting<ShoppingCartSettings>(storeScope);
var model = new SalesSettingsModel {
LoyaltyPointsSettings = loyaltyPointsSettings.ToModel(),
@@ -237,7 +237,7 @@ public class SettingController(
ActiveStore = storeScope
};
- var currencySettings = settingService.LoadSetting<CurrencySettings>();
+ var currencySettings = await settingService.LoadSetting<CurrencySettings>();
var currency = await currencyService.GetCurrencyById(currencySettings.PrimaryStoreCurrencyId);
//loyal
@@ -266,15 +266,15 @@ public class SettingController(
if (ModelState.IsValid)
{
- var loyaltyPointsSettings = settingService.LoadSetting<LoyaltyPointsSettings>(storeScope);
+ var loyaltyPointsSettings = await settingService.LoadSetting<LoyaltyPointsSettings>(storeScope);
loyaltyPointsSettings = model.LoyaltyPointsSettings.ToEntity(loyaltyPointsSettings);
await settingService.SaveSetting(loyaltyPointsSettings, storeScope);
- var shoppingCartSettings = settingService.LoadSetting<ShoppingCartSettings>(storeScope);
+ var shoppingCartSettings = await settingService.LoadSetting<ShoppingCartSettings>(storeScope);
shoppingCartSettings = model.ShoppingCartSettings.ToEntity(shoppingCartSettings);
await settingService.SaveSetting(shoppingCartSettings, storeScope);
- var orderSettings = settingService.LoadSetting<OrderSettings>(storeScope);
+ var orderSettings = await settingService.LoadSetting<OrderSettings>(storeScope);
orderSettings = model.OrderSettings.ToEntity(orderSettings);
await settingService.SaveSetting(orderSettings, storeScope);
@@ -529,7 +529,7 @@ public class SettingController(
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var mediaSettings = settingService.LoadSetting<MediaSettings>(storeScope);
+ var mediaSettings = await settingService.LoadSetting<MediaSettings>(storeScope);
var model = mediaSettings.ToModel();
model.ActiveStore = storeScope;
@@ -542,7 +542,7 @@ public class SettingController(
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var mediaSettings = settingService.LoadSetting<MediaSettings>(storeScope);
+ var mediaSettings = await settingService.LoadSetting<MediaSettings>(storeScope);
mediaSettings = model.ToEntity(mediaSettings);
await settingService.SaveSetting(mediaSettings, storeScope);
@@ -559,8 +559,8 @@ public class SettingController(
public async Task<IActionResult> Customer()
{
var storeScope = await GetActiveStore();
- var customerSettings = settingService.LoadSetting<CustomerSettings>(storeScope);
- var addressSettings = settingService.LoadSetting<AddressSettings>(storeScope);
+ var customerSettings = await settingService.LoadSetting<CustomerSettings>(storeScope);
+ var addressSettings = await settingService.LoadSetting<AddressSettings>(storeScope);
//merge settings
var model = new CustomerSettingsModel {
@@ -575,8 +575,8 @@ public class SettingController(
public async Task<IActionResult> Customer(CustomerSettingsModel model)
{
var storeScope = await GetActiveStore();
- var customerSettings = settingService.LoadSetting<CustomerSettings>(storeScope);
- var addressSettings = settingService.LoadSetting<AddressSettings>(storeScope);
+ var customerSettings = await settingService.LoadSetting<CustomerSettings>(storeScope);
+ var addressSettings = await settingService.LoadSetting<AddressSettings>(storeScope);
customerSettings = model.CustomerSettings.ToEntity(customerSettings);
await settingService.SaveSetting(customerSettings, storeScope);
@@ -601,7 +601,7 @@ public class SettingController(
var storeScope = await GetActiveStore();
model.ActiveStore = storeScope;
//datettime settings
- var dateTimeSettings = settingService.LoadSetting<DateTimeSettings>(storeScope);
+ var dateTimeSettings = await settingService.LoadSetting<DateTimeSettings>(storeScope);
model.DateTimeSettings.DefaultStoreTimeZoneId = dateTimeSettings.DefaultStoreTimeZoneId;
var iswindows = OperatingSystem.IsWindows();
foreach (var timeZone in dateTimeService.GetSystemTimeZones())
@@ -616,7 +616,7 @@ public class SettingController(
}
//store information
- var storeInformationSettings = settingService.LoadSetting<StoreInformationSettings>(storeScope);
+ var storeInformationSettings = await settingService.LoadSetting<StoreInformationSettings>(storeScope);
model.StoreInformationSettings = storeInformationSettings.ToModel();
model.StoreInformationSettings.AvailableStoreThemes =
@@ -631,17 +631,17 @@ public class SettingController(
}).ToList();
//common
- var commonSettings = settingService.LoadSetting<CommonSettings>(storeScope);
+ var commonSettings = await settingService.LoadSetting<CommonSettings>(storeScope);
model.CommonSettings = commonSettings.ToModel();
//seo settings
- var seoSettings = settingService.LoadSetting<SeoSettings>(storeScope);
+ var seoSettings = await settingService.LoadSetting<SeoSettings>(storeScope);
model.SeoSettings = seoSettings.ToModel();
//security settings
- var securitySettings = settingService.LoadSetting<SecuritySettings>(storeScope);
+ var securitySettings = await settingService.LoadSetting<SecuritySettings>(storeScope);
//captcha settings
- var captchaSettings = settingService.LoadSetting<CaptchaSettings>(storeScope);
+ var captchaSettings = await settingService.LoadSetting<CaptchaSettings>(storeScope);
model.SecuritySettings = captchaSettings.ToModel();
if (securitySettings.AdminAreaAllowedIpAddresses != null)
@@ -655,11 +655,11 @@ public class SettingController(
model.SecuritySettings.AvailableReCaptchaVersions = enumTranslationService.ToSelectList(GoogleReCaptchaVersion.V2, false).ToList();
//PDF settings
- var pdfSettings = settingService.LoadSetting<PdfSettings>(storeScope);
+ var pdfSettings = await settingService.LoadSetting<PdfSettings>(storeScope);
model.PdfSettings = pdfSettings.ToModel();
//display menu settings
- var displayMenuItemSettings = settingService.LoadSetting<MenuItemSettings>(storeScope);
+ var displayMenuItemSettings = await settingService.LoadSetting<MenuItemSettings>(storeScope);
model.DisplayMenuSettings = displayMenuItemSettings.ToModel();
return View(model);
@@ -672,27 +672,27 @@ public class SettingController(
var storeScope = await GetActiveStore();
//store information settings
- var storeInformationSettings = settingService.LoadSetting<StoreInformationSettings>(storeScope);
+ var storeInformationSettings = await settingService.LoadSetting<StoreInformationSettings>(storeScope);
storeInformationSettings = model.StoreInformationSettings.ToEntity(storeInformationSettings);
await settingService.SaveSetting(storeInformationSettings, storeScope);
//datetime settings
- var dateTimeSettings = settingService.LoadSetting<DateTimeSettings>(storeScope);
+ var dateTimeSettings = await settingService.LoadSetting<DateTimeSettings>(storeScope);
dateTimeSettings.DefaultStoreTimeZoneId = model.DateTimeSettings.DefaultStoreTimeZoneId;
await settingService.SaveSetting(dateTimeSettings, storeScope);
//common settings
- var commonSettings = settingService.LoadSetting<CommonSettings>(storeScope);
+ var commonSettings = await settingService.LoadSetting<CommonSettings>(storeScope);
commonSettings = model.CommonSettings.ToEntity(commonSettings);
await settingService.SaveSetting(commonSettings, storeScope);
//seo settings
- var seoSettings = settingService.LoadSetting<SeoSettings>(storeScope);
+ var seoSettings = await settingService.LoadSetting<SeoSettings>(storeScope);
seoSettings = model.SeoSettings.ToEntity(seoSettings);
await settingService.SaveSetting(seoSettings, storeScope);
//security settings
- var securitySettings = settingService.LoadSetting<SecuritySettings>(storeScope);
+ var securitySettings = await settingService.LoadSetting<SecuritySettings>(storeScope);
securitySettings.AdminAreaAllowedIpAddresses ??= [];
securitySettings.AdminAreaAllowedIpAddresses.Clear();
@@ -705,7 +705,7 @@ public class SettingController(
await settingService.SaveSetting(securitySettings);
//captcha settings
- var captchaSettings = settingService.LoadSetting<CaptchaSettings>(storeScope);
+ var captchaSettings = await settingService.LoadSetting<CaptchaSettings>(storeScope);
captchaSettings = model.SecuritySettings.ToEntity(captchaSettings);
await settingService.SaveSetting(captchaSettings);
if (captchaSettings.Enabled &&
@@ -715,12 +715,12 @@ public class SettingController(
Error("Captcha is enabled but the appropriate keys are not entered");
//PDF settings
- var pdfSettings = settingService.LoadSetting<PdfSettings>(storeScope);
+ var pdfSettings = await settingService.LoadSetting<PdfSettings>(storeScope);
pdfSettings = model.PdfSettings.ToEntity(pdfSettings);
await settingService.SaveSetting(pdfSettings, storeScope);
//menu item settings
- var displayMenuItemSettings = settingService.LoadSetting<MenuItemSettings>(storeScope);
+ var displayMenuItemSettings = await settingService.LoadSetting<MenuItemSettings>(storeScope);
displayMenuItemSettings = model.DisplayMenuSettings.ToEntity(displayMenuItemSettings);
await settingService.SaveSetting(displayMenuItemSettings, storeScope);
@@ -738,7 +738,7 @@ public class SettingController(
public async Task<IActionResult> PushNotifications()
{
var storeScope = await GetActiveStore();
- var settings = settingService.LoadSetting<PushNotificationsSettings>(storeScope);
+ var settings = await settingService.LoadSetting<PushNotificationsSettings>(storeScope);
var model = settings.ToModel();
return View(model);
@@ -748,7 +748,7 @@ public class SettingController(
public async Task<IActionResult> PushNotifications(PushNotificationsSettingsModel model, [FromServices] IConfiguration configuration, [FromServices] IWebHostEnvironment webHostEnvironment)
{
var storeScope = await GetActiveStore();
- var settings = settingService.LoadSetting<PushNotificationsSettings>(storeScope);
+ var settings = await settingService.LoadSetting<PushNotificationsSettings>(storeScope);
settings = model.ToEntity(settings);
await settingService.SaveSetting(settings);
@@ -810,9 +810,9 @@ public class SettingController(
return lines;
}
- public IActionResult AdminSearch()
+ public async Task<IActionResult> AdminSearch()
{
- var settings = settingService.LoadSetting<AdminSearchSettings>();
+ var settings = await settingService.LoadSetting<AdminSearchSettings>();
var model = settings.ToModel();
return View(model);
}
@@ -820,7 +820,7 @@ public class SettingController(
[HttpPost]
public async Task<IActionResult> AdminSearch(AdminSearchSettingsModel model)
{
- var settings = settingService.LoadSetting<AdminSearchSettings>();
+ var settings = await settingService.LoadSetting<AdminSearchSettings>();
settings = model.ToEntity(settings);
await settingService.SaveSetting(settings);
@@ -828,14 +828,14 @@ public class SettingController(
await ClearCache();
Success(translationService.GetResource("Admin.Configuration.Updated"));
- return AdminSearch();
+ return await AdminSearch();
}
#region System settings
public async Task<IActionResult> SystemSetting()
{
- var settings = settingService.LoadSetting<SystemSettings>();
+ var settings = await settingService.LoadSetting<SystemSettings>();
var model = new SystemSettingsModel {
//order ident
@@ -846,24 +846,24 @@ public class SettingController(
};
//storage settings
- var storagesettings = settingService.LoadSetting<StorageSettings>();
+ var storagesettings = await settingService.LoadSetting<StorageSettings>();
model.PicturesStoredIntoDatabase = storagesettings.PictureStoreInDb;
//area admin settings
- var adminsettings = settingService.LoadSetting<AdminAreaSettings>();
+ var adminsettings = await settingService.LoadSetting<AdminAreaSettings>();
model.DefaultGridPageSize = adminsettings.DefaultGridPageSize;
model.GridPageSizes = adminsettings.GridPageSizes;
model.UseIsoDateTimeConverterInJson = adminsettings.UseIsoDateTimeConverterInJson;
model.HideStoreColumn = adminsettings.HideStoreColumn;
//language settings
- var langsettings = settingService.LoadSetting<LanguageSettings>();
+ var langsettings = await settingService.LoadSetting<LanguageSettings>();
model.IgnoreRtlPropertyForAdminArea = langsettings.IgnoreRtlPropertyForAdminArea;
model.AutomaticallyDetectLanguage = langsettings.AutomaticallyDetectLanguage;
model.DefaultAdminLanguageId = langsettings.DefaultAdminLanguageId;
//others
- var docsettings = settingService.LoadSetting<DocumentSettings>();
+ var docsettings = await settingService.LoadSetting<DocumentSettings>();
model.DocumentPageSizeSettings = docsettings.PageSize;
return View(model);
@@ -873,7 +873,7 @@ public class SettingController(
public async Task<IActionResult> SystemSetting(SystemSettingsModel model)
{
//system
- var settings = settingService.LoadSetting<SystemSettings>();
+ var settings = await settingService.LoadSetting<SystemSettings>();
settings.DaysToCancelUnpaidOrder = model.DaysToCancelUnpaidOrder;
settings.DeleteGuestTaskOlderThanMinutes = model.DeleteGuestTaskOlderThanMinutes;
await settingService.SaveSetting(settings);
@@ -882,7 +882,7 @@ public class SettingController(
if (model.OrderIdent is > 0) await mediator.Send(new MaxOrderNumberCommand { OrderNumber = model.OrderIdent });
//admin area
- var adminAreaSettings = settingService.LoadSetting<AdminAreaSettings>();
+ var adminAreaSettings = await settingService.LoadSetting<AdminAreaSettings>();
adminAreaSettings.DefaultGridPageSize = model.DefaultGridPageSize;
adminAreaSettings.GridPageSizes = model.GridPageSizes;
adminAreaSettings.UseIsoDateTimeConverterInJson = model.UseIsoDateTimeConverterInJson;
@@ -890,14 +890,14 @@ public class SettingController(
await settingService.SaveSetting(adminAreaSettings);
//language settings
- var langsettings = settingService.LoadSetting<LanguageSettings>();
+ var langsettings = await settingService.LoadSetting<LanguageSettings>();
langsettings.IgnoreRtlPropertyForAdminArea = model.IgnoreRtlPropertyForAdminArea;
langsettings.AutomaticallyDetectLanguage = model.AutomaticallyDetectLanguage;
langsettings.DefaultAdminLanguageId = model.DefaultAdminLanguageId;
await settingService.SaveSetting(langsettings);
//doc settings
- var docsettings = settingService.LoadSetting<DocumentSettings>();
+ var docsettings = await settingService.LoadSetting<DocumentSettings>();
docsettings.PageSize = model.DocumentPageSizeSettings;
await settingService.SaveSetting(docsettings);
@@ -912,7 +912,7 @@ public class SettingController(
[HttpPost]
public async Task<IActionResult> ChangePictureStorage()
{
- var storageSettings = settingService.LoadSetting<StorageSettings>();
+ var storageSettings = await settingService.LoadSetting<StorageSettings>();
var storeIdDb = !storageSettings.PictureStoreInDb;
storageSettings.PictureStoreInDb = storeIdDb;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
index a2f75035a..ba8b5c360 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
@@ -155,7 +155,7 @@ public class ShippingController : BaseAdminController
{
var storeScope = await GetActiveStore();
- var _shippingProviderSettings = _settingService.LoadSetting<ShippingProviderSettings>(storeScope);
+ var _shippingProviderSettings = await _settingService.LoadSetting<ShippingProviderSettings>(storeScope);
var shippingProvidersModel = new List<ShippingRateComputationMethodModel>();
var shippingProviders = _shippingService.LoadAllShippingRateCalculationProviders();
foreach (var shippingProvider in shippingProviders)
@@ -179,7 +179,7 @@ public class ShippingController : BaseAdminController
{
var storeScope = await GetActiveStore();
- var _shippingProviderSettings = _settingService.LoadSetting<ShippingProviderSettings>(storeScope);
+ var _shippingProviderSettings = await _settingService.LoadSetting<ShippingProviderSettings>(storeScope);
var srcm = _shippingService.LoadShippingRateCalculationProviderBySystemName(model.SystemName);
if (srcm.IsShippingRateMethodActive(_shippingProviderSettings))
@@ -315,7 +315,7 @@ public class ShippingController : BaseAdminController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var shippingSettings = _settingService.LoadSetting<ShippingSettings>(storeScope);
+ var shippingSettings = await _settingService.LoadSetting<ShippingSettings>(storeScope);
var model = shippingSettings.ToModel();
model.ActiveStore = storeScope;
@@ -356,7 +356,7 @@ public class ShippingController : BaseAdminController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var shippingSettings = _settingService.LoadSetting<ShippingSettings>(storeScope);
+ var shippingSettings = await _settingService.LoadSetting<ShippingSettings>(storeScope);
shippingSettings = model.ToEntity(shippingSettings);
await _settingService.SaveSetting(shippingSettings, storeScope);
diff --git a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs b/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
index fb2a050ab..d87a42e68 100644
--- a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
@@ -75,8 +75,8 @@ public class TaxController : BaseAdminController
public async Task<IActionResult> Providers(DataSourceRequest command)
{
var storeScope = await GetActiveStore();
- _settingService.LoadSetting<TaxSettings>(storeScope);
- var taxProviderSettings = _settingService.LoadSetting<TaxProviderSettings>();
+ await _settingService.LoadSetting<TaxSettings>(storeScope);
+ var taxProviderSettings = await _settingService.LoadSetting<TaxProviderSettings>();
var taxProviders = _taxService.LoadAllTaxProviders()
.ToList();
@@ -106,7 +106,7 @@ public class TaxController : BaseAdminController
public async Task<IActionResult> MarkAsPrimaryProvider(string systemName)
{
- var taxProviderettings = _settingService.LoadSetting<TaxProviderSettings>();
+ var taxProviderettings = await _settingService.LoadSetting<TaxProviderSettings>();
if (string.IsNullOrEmpty(systemName)) return RedirectToAction("Providers");
var taxProvider = _taxService.LoadTaxProviderBySystemName(systemName);
@@ -130,7 +130,7 @@ public class TaxController : BaseAdminController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var taxSettings = _settingService.LoadSetting<TaxSettings>(storeScope);
+ var taxSettings = await _settingService.LoadSetting<TaxSettings>(storeScope);
var model = taxSettings.ToModel();
model.ActiveStore = storeScope;
@@ -186,7 +186,7 @@ public class TaxController : BaseAdminController
{
//load settings for a chosen store scope
var storeScope = await GetActiveStore();
- var taxSettings = _settingService.LoadSetting<TaxSettings>(storeScope);
+ var taxSettings = await _settingService.LoadSetting<TaxSettings>(storeScope);
taxSettings = model.ToEntity(taxSettings);
await _settingService.SaveSetting(taxSettings, storeScope);
diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
index 8da41580a..dbbff6985 100644
--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
@@ -239,7 +239,7 @@ public class OrderViewModelService : IOrderViewModelService
//payment methods
model.AvailablePaymentMethods.Add(new SelectListItem
{ Text = _translationService.GetResource("Admin.Common.All"), Value = " " });
- foreach (var pm in _paymentService.LoadAllPaymentMethods())
+ foreach (var pm in await _paymentService.LoadAllPaymentMethods())
model.AvailablePaymentMethods.Add(new SelectListItem { Text = pm.FriendlyName, Value = pm.SystemName });
//billing countries
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
index 84adf8d81..2840a8bd4 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
@@ -9,7 +9,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Plugins;
using Grand.Infrastructure.TypeSearch;
-using Grand.SharedKernel.Extensions;
using Grand.Web.Common.View;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.DataProtection;
diff --git a/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
index c31add90b..5854a4c83 100644
--- a/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
+++ b/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
@@ -41,7 +41,7 @@ public class InstallUrlMiddleware
public async Task InvokeAsync(HttpContext context)
{
var databaseIsInstalled = DataSettingsManager.DatabaseIsInstalled();
- var version = GetDatabaseVersion(context, databaseIsInstalled);
+ var version = await GetDatabaseVersion(context, databaseIsInstalled);
if (version == null)
{
@@ -71,14 +71,15 @@ public class InstallUrlMiddleware
//call the next middleware in the request pipeline
await _next(context);
}
- private GrandNodeVersion? GetDatabaseVersion(HttpContext context, bool databaseIsInstalled)
+ private Task<GrandNodeVersion?> GetDatabaseVersion(HttpContext context, bool databaseIsInstalled)
{
- return _cacheBase.Get(CacheKey.GRAND_NODE_VERSION, () =>
+ return _cacheBase.GetAsync(CacheKey.GRAND_NODE_VERSION, () =>
{
- if (databaseIsInstalled)
- return context.RequestServices.GetRequiredService<IRepository<GrandNodeVersion>>().Table.FirstOrDefault();
+ if (databaseIsInstalled)
+ return Task.FromResult(context.RequestServices.GetRequiredService<IRepository<GrandNodeVersion>>().Table.FirstOrDefault());
+
+ return Task.FromResult<GrandNodeVersion?>(null);
- return null;
}, int.MaxValue);
}
diff --git a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
index 6a1611c08..141cfe93e 100644
--- a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
+++ b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
@@ -4,7 +4,6 @@ using Grand.Data;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Message;
-using Grand.Infrastructure.Caching.RabbitMq;
using Grand.Infrastructure.Caching.Redis;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Validators;
@@ -69,11 +68,6 @@ public class StartupApplication : IStartupApplication
serviceCollection.AddSingleton<ICacheBase, RedisMessageCacheManager>();
return;
}
-
- var rabbit = new RabbitConfig();
- configuration.GetSection("Rabbit").Bind(rabbit);
- if (rabbit.RabbitCachePubSubEnabled && rabbit.RabbitEnabled)
- serviceCollection.AddSingleton<ICacheBase, RabbitMqMessageCacheManager>();
}
private void RegisterContextService(IServiceCollection serviceCollection)
diff --git a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json b/src/Web/Grand.Web.Vendor/App_Data/appsettings.json
index 898c13214..bc8dc4e2a 100644
--- a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json
+++ b/src/Web/Grand.Web.Vendor/App_Data/appsettings.json
@@ -122,17 +122,6 @@
"PersistKeysToRedis": false,
"PersistKeysToRedisUrl": "127.0.0.1:6379,allowAdmin=true,defaultDatabase=1"
},
- "Rabbit": {
- //Enable RabbitMq
- "RabbitEnabled": false,
- "RabbitCachePubSubEnabled": false,
- "RabbitHostName": "localhost",
- "RabbitVirtualHost": "/",
- "RabbitUsername": "guest",
- "RabbitPassword": "guest",
- //must be unique for each instance
- "RabbitCacheReceiveEndpoint": "grandnode"
- },
"UrlRewrite": {
//Load url rewrite rules from external file AppData/UrlRewrite.xml
"UseUrlRewrite": false,
diff --git a/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs
index beeb3e32d..3d3b89c24 100644
--- a/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs
@@ -179,7 +179,7 @@ public class OrderViewModelService : IOrderViewModelService
//payment methods
model.AvailablePaymentMethods.Add(new SelectListItem
{ Text = _translationService.GetResource("Vendor.Common.All"), Value = " " });
- foreach (var pm in _paymentService.LoadAllPaymentMethods())
+ foreach (var pm in await _paymentService.LoadAllPaymentMethods())
model.AvailablePaymentMethods.Add(new SelectListItem { Text = pm.FriendlyName, Value = pm.SystemName });
//billing countries
diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
index 8beaa9493..e4d764a30 100644
--- a/src/Web/Grand.Web/App_Data/appsettings.json
+++ b/src/Web/Grand.Web/App_Data/appsettings.json
@@ -122,17 +122,6 @@
"PersistKeysToRedis": false,
"PersistKeysToRedisUrl": "127.0.0.1:6379,allowAdmin=true,defaultDatabase=1"
},
- "Rabbit": {
- //Enable RabbitMq
- "RabbitEnabled": false,
- "RabbitCachePubSubEnabled": false,
- "RabbitHostName": "localhost",
- "RabbitVirtualHost": "/",
- "RabbitUsername": "guest",
- "RabbitPassword": "guest",
- //must be unique for each instance
- "RabbitCacheReceiveEndpoint": "grandnode"
- },
"UrlRewrite": {
//Load url rewrite rules from external file AppData/UrlRewrite.xml
"UseUrlRewrite": false,