diff --git a/Core.Inventory.DAL.API/Core.Inventory.DAL.API.csproj b/Core.Inventory.DAL.API/Core.Inventory.DAL.API.csproj index ee8c4a5..4d7f5c3 100644 --- a/Core.Inventory.DAL.API/Core.Inventory.DAL.API.csproj +++ b/Core.Inventory.DAL.API/Core.Inventory.DAL.API.csproj @@ -8,7 +8,7 @@ - + diff --git a/Core.Inventory.DAL.API/appsettings.Local.json b/Core.Inventory.DAL.API/appsettings.Local.json index 30170dd..2e57feb 100644 --- a/Core.Inventory.DAL.API/appsettings.Local.json +++ b/Core.Inventory.DAL.API/appsettings.Local.json @@ -15,7 +15,7 @@ "LocalAudience": "InventotyLocal" }, "DetailedErrors": true, - "UseRedisCache": true, + "UseRedisCache": false, "CacheSettings": { "DefaultCacheDurationInMinutes": 3 }, diff --git a/Core.Inventory.Provider/Core.Inventory.Provider.csproj b/Core.Inventory.Provider/Core.Inventory.Provider.csproj index 5b9224c..f6a7031 100644 --- a/Core.Inventory.Provider/Core.Inventory.Provider.csproj +++ b/Core.Inventory.Provider/Core.Inventory.Provider.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Core.Inventory.Provider/Providers/Inventory/FurnitureBaseProvider.cs b/Core.Inventory.Provider/Providers/Inventory/FurnitureBaseProvider.cs index 814c0d2..d462702 100644 --- a/Core.Inventory.Provider/Providers/Inventory/FurnitureBaseProvider.cs +++ b/Core.Inventory.Provider/Providers/Inventory/FurnitureBaseProvider.cs @@ -79,7 +79,7 @@ namespace Core.Inventory.Provider.Providers.Inventory if (cachedData.Any()) return cachedData; var data = await repository.AsQueryable(); - await cacheProvider.SetAsync(cacheKey, data); + await cacheProvider.SetAsync(cacheKey, data, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return data; } @@ -97,7 +97,7 @@ namespace Core.Inventory.Provider.Providers.Inventory if (cached is not null) return cached; var result = await repository.FindByIdAsync(mongoId); - await cacheProvider.SetAsync(cacheKey, result); + await cacheProvider.SetAsync(cacheKey, result, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return result; } diff --git a/Core.Inventory.Provider/Providers/Inventory/FurnitureVariantProvider.cs b/Core.Inventory.Provider/Providers/Inventory/FurnitureVariantProvider.cs index d900c65..cf6b26b 100644 --- a/Core.Inventory.Provider/Providers/Inventory/FurnitureVariantProvider.cs +++ b/Core.Inventory.Provider/Providers/Inventory/FurnitureVariantProvider.cs @@ -84,7 +84,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var variants = await repository.FilterByMongoFilterAsync(filter); if (variants is not null && variants.Any()) - await cacheProvider.SetAsync(cacheKey, variants); + await cacheProvider.SetAsync(cacheKey, variants, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return variants ?? []; } @@ -103,7 +103,7 @@ namespace Core.Inventory.Provider.Providers.Inventory if (cached is not null) return cached; var result = await repository.FindByIdAsync(mongoId); - await cacheProvider.SetAsync(cacheKey, result); + await cacheProvider.SetAsync(cacheKey, result, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return result; } @@ -125,7 +125,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var variants = await repository.FilterByMongoFilterAsync(filter); if (variants is not null && variants.Any()) - await cacheProvider.SetAsync(cacheKey, variants); + await cacheProvider.SetAsync(cacheKey, variants, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return variants ?? []; } @@ -157,7 +157,7 @@ namespace Core.Inventory.Provider.Providers.Inventory if (cachedData.Any()) return cachedData; var data = await repository.AsQueryable(); - await cacheProvider.SetAsync(cacheKey, data); + await cacheProvider.SetAsync(cacheKey, data, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return data; } diff --git a/Core.Inventory.Provider/Providers/Inventory/ProductProvider.cs b/Core.Inventory.Provider/Providers/Inventory/ProductProvider.cs index 807646c..94f56e1 100644 --- a/Core.Inventory.Provider/Providers/Inventory/ProductProvider.cs +++ b/Core.Inventory.Provider/Providers/Inventory/ProductProvider.cs @@ -6,8 +6,8 @@ using Core.Inventory.Domain.Contexts.Inventory.Request; using Core.Inventory.Provider.Contracts; using Mapster; using Microsoft.Extensions.Options; -using MongoDB.Driver; using MongoDB.Bson; +using MongoDB.Driver; namespace Core.Inventory.Provider.Providers.Inventory { @@ -60,7 +60,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var product = await repository.FindByIdAsync(_id); - await cacheProvider.SetAsync(cacheKey, product); + await cacheProvider.SetAsync(cacheKey, product, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return product; } @@ -79,7 +79,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var products = await repository.AsQueryable(); - await cacheProvider.SetAsync(cacheKey, products); + await cacheProvider.SetAsync(cacheKey, products, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return products; } @@ -110,7 +110,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var productsList = await repository.FilterByMongoFilterAsync(finalFilter); - await cacheProvider.SetAsync(cacheKey, productsList); + await cacheProvider.SetAsync(cacheKey, productsList, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return productsList; } @@ -156,7 +156,7 @@ namespace Core.Inventory.Provider.Providers.Inventory public async ValueTask AddTagToProduct(string productId, string tagId, CancellationToken cancellationToken) { var product = await repository.FindByIdAsync(productId); - + if (product != null) { var objectId = ObjectId.Parse(tagId); diff --git a/Core.Inventory.Provider/Providers/Inventory/TagOverrideProvider.cs b/Core.Inventory.Provider/Providers/Inventory/TagOverrideProvider.cs index b9875c3..b764926 100644 --- a/Core.Inventory.Provider/Providers/Inventory/TagOverrideProvider.cs +++ b/Core.Inventory.Provider/Providers/Inventory/TagOverrideProvider.cs @@ -59,7 +59,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var TagOverride = await repository.FindByIdAsync(_id); - await cacheProvider.SetAsync(cacheKey, TagOverride); + await cacheProvider.SetAsync(cacheKey, TagOverride, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return TagOverride; } @@ -78,7 +78,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var TagOverrides = await repository.AsQueryable(); - await cacheProvider.SetAsync(cacheKey, TagOverrides); + await cacheProvider.SetAsync(cacheKey, TagOverrides, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return TagOverrides; } @@ -109,7 +109,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var TagOverridesList = await repository.FilterByMongoFilterAsync(finalFilter); - await cacheProvider.SetAsync(cacheKey, TagOverridesList); + await cacheProvider.SetAsync(cacheKey, TagOverridesList, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return TagOverridesList; } diff --git a/Core.Inventory.Provider/Providers/Inventory/TagProvider.cs b/Core.Inventory.Provider/Providers/Inventory/TagProvider.cs index fbc067d..fb39636 100644 --- a/Core.Inventory.Provider/Providers/Inventory/TagProvider.cs +++ b/Core.Inventory.Provider/Providers/Inventory/TagProvider.cs @@ -59,7 +59,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var tag = await repository.FindByIdAsync(_id); - await cacheProvider.SetAsync(cacheKey, tag); + await cacheProvider.SetAsync(cacheKey, tag, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return tag; } @@ -78,7 +78,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var tags = await repository.AsQueryable(); - await cacheProvider.SetAsync(cacheKey, tags); + await cacheProvider.SetAsync(cacheKey, tags, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return tags; } @@ -109,7 +109,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var TagsList = await repository.FilterByMongoFilterAsync(finalFilter); - await cacheProvider.SetAsync(cacheKey, TagsList); + await cacheProvider.SetAsync(cacheKey, TagsList, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return TagsList; } diff --git a/Core.Inventory.Provider/Providers/Inventory/TagTypeProvider.cs b/Core.Inventory.Provider/Providers/Inventory/TagTypeProvider.cs index 4776e44..54ed7ae 100644 --- a/Core.Inventory.Provider/Providers/Inventory/TagTypeProvider.cs +++ b/Core.Inventory.Provider/Providers/Inventory/TagTypeProvider.cs @@ -7,7 +7,6 @@ using Core.Inventory.Provider.Contracts; using Mapster; using Microsoft.Extensions.Options; using MongoDB.Driver; -using System.Security.Cryptography; namespace Core.Inventory.Provider.Providers.Inventory { @@ -60,7 +59,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var tagType = await repository.FindByIdAsync(_id); - await cacheProvider.SetAsync(cacheKey, tagType); + await cacheProvider.SetAsync(cacheKey, tagType, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return tagType; } @@ -79,7 +78,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var tagTypes = await repository.AsQueryable(); - await cacheProvider.SetAsync(cacheKey, tagTypes); + await cacheProvider.SetAsync(cacheKey, tagTypes, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return tagTypes; } @@ -110,7 +109,7 @@ namespace Core.Inventory.Provider.Providers.Inventory var tagTypesList = await repository.FilterByMongoFilterAsync(finalFilter); - await cacheProvider.SetAsync(cacheKey, tagTypesList); + await cacheProvider.SetAsync(cacheKey, tagTypesList, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes)); return tagTypesList; }