neozhu · neozhu · Aug 3, 2023 · Aug 3, 2023
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -23,11 +23,11 @@
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.6.0" />
     <PackageReference Include="LazyCache" Version="2.4.0" />
     <PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
-    <PackageReference Include="MediatR" Version="12.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
+    <PackageReference Include="MediatR" Version="12.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.9" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.3" />
   </ItemGroup>
 

diff --git a/src/Application/Common/Behaviours/CacheInvalidationBehaviour.cs b/src/Application/Common/Behaviours/CacheInvalidationBehaviour.cs
@@ -27,7 +27,7 @@ public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TRe
         {
             _cache.Remove(request.CacheKey);
         }
-        request.SharedExpiryTokenSource?.TryReset();
+        request.SharedExpiryTokenSource?.Cancel();
 
         return response;
     }

diff --git a/src/Application/Features/ApprovalHistories/Caching/ApprovalHistoryCacheKey.cs b/src/Application/Features/ApprovalHistories/Caching/ApprovalHistoryCacheKey.cs
@@ -23,6 +23,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/CheckinPoints/Caching/CheckinPointCacheKey.cs b/src/Application/Features/CheckinPoints/Caching/CheckinPointCacheKey.cs
@@ -22,6 +22,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/Departments/Caching/DepartmentCacheKey.cs b/src/Application/Features/Departments/Caching/DepartmentCacheKey.cs
@@ -22,6 +22,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/Designations/Caching/DesignationCacheKey.cs b/src/Application/Features/Designations/Caching/DesignationCacheKey.cs
@@ -22,6 +22,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/Devices/Caching/DeviceCacheKey.cs b/src/Application/Features/Devices/Caching/DeviceCacheKey.cs
@@ -22,6 +22,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/Employees/Caching/EmployeeCacheKey.cs b/src/Application/Features/Employees/Caching/EmployeeCacheKey.cs
@@ -23,6 +23,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/Employees/Queries/Pagination/EmployeesPaginationQuery.cs b/src/Application/Features/Employees/Queries/Pagination/EmployeesPaginationQuery.cs
@@ -15,7 +15,7 @@ public class EmployeesWithPaginationQuery : PaginationFilter, IRequest<Paginated
 
     public override string ToString()
     {
-        return $"{base.ToString()},Name:{Name},Email:{Email},DepartmentId:{DepartmentId}";
+        return $"{base.ToString()},Name:{Name},Email:{Email},DepartmentId:{DepartmentId},SiteId:{SiteId}";
     }
     public string CacheKey => EmployeeCacheKey.GetPagtionCacheKey($"{this}");
     public MemoryCacheEntryOptions? Options => EmployeeCacheKey.MemoryCacheEntryOptions;

diff --git a/src/Application/Features/MessageTemplates/Caching/MessageTemplateCacheKey.cs b/src/Application/Features/MessageTemplates/Caching/MessageTemplateCacheKey.cs
@@ -22,6 +22,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/SiteConfigurations/Caching/SiteConfigurationCacheKey.cs b/src/Application/Features/SiteConfigurations/Caching/SiteConfigurationCacheKey.cs
@@ -26,6 +26,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/Sites/Caching/SiteCacheKey.cs b/src/Application/Features/Sites/Caching/SiteCacheKey.cs
@@ -22,6 +22,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/VisitorHistories/Caching/VisitorHistoryCacheKey.cs b/src/Application/Features/VisitorHistories/Caching/VisitorHistoryCacheKey.cs
@@ -26,6 +26,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Application/Features/Visitors/Caching/VisitorCacheKey.cs b/src/Application/Features/Visitors/Caching/VisitorCacheKey.cs
@@ -58,6 +58,10 @@ public static CancellationTokenSource SharedExpiryTokenSource()
         }
         return _tokensource;
     }
+    public static void Refresh()
+    {
+        SharedExpiryTokenSource().Cancel();
+    }
     public static MemoryCacheEntryOptions MemoryCacheEntryOptions => new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(SharedExpiryTokenSource().Token));
 }
 
diff --git a/src/Blazor.Server.UI/Blazor.Server.UI.csproj b/src/Blazor.Server.UI/Blazor.Server.UI.csproj
@@ -14,11 +14,11 @@
         <PackageReference Include="Blazor-Analytics" Version="3.12.0" />
         <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
       <PackageReference Include="Blazor-ApexCharts" Version="0.9.21-beta" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.8">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-       <PackageReference Include="MudBlazor" Version="6.6.0" />
+       <PackageReference Include="MudBlazor" Version="6.8.0" />
 
        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />

diff --git a/src/Blazor.Server.UI/Pages/CheckinPoints/CheckinPoints.razor b/src/Blazor.Server.UI/Pages/CheckinPoints/CheckinPoints.razor
@@ -1,6 +1,7 @@
 @page "/visitor/checkinPoints"
 
 
+@using CleanArchitecture.Blazor.Application.Features.CheckinPoints.Caching;
 @using CleanArchitecture.Blazor.Application.Features.CheckinPoints.Commands.Delete
 @using CleanArchitecture.Blazor.Application.Features.CheckinPoints.DTOs
 @using CleanArchitecture.Blazor.Application.Features.CheckinPoints.Queries.Pagination
@@ -274,6 +275,7 @@
     {
         _selectedItems = new();
         _searchString = string.Empty;
+        CheckinPointCacheKey.Refresh();
         await _table.ReloadServerData();
     }
     private async Task OnCreate()

diff --git a/src/Blazor.Server.UI/Pages/Designations/Designations.razor b/src/Blazor.Server.UI/Pages/Designations/Designations.razor
@@ -1,4 +1,5 @@
 @page "/visitor/designations"
+@using CleanArchitecture.Blazor.Application.Features.Designations.Caching;
 @using CleanArchitecture.Blazor.Application.Features.Designations.Commands.Delete
 @using CleanArchitecture.Blazor.Application.Features.Designations.DTOs
 @using CleanArchitecture.Blazor.Application.Features.Designations.Queries.Pagination
@@ -240,6 +241,7 @@
     {
         _selectedItems = new();
         _searchString = string.Empty;
+        DesignationCacheKey.Refresh();
         await _table.ReloadServerData();
     }
     private async Task OnCreate()

diff --git a/src/Blazor.Server.UI/Pages/Devices/Devices.razor b/src/Blazor.Server.UI/Pages/Devices/Devices.razor
@@ -1,6 +1,7 @@
 @page "/visitor/devices"
 
 
+@using CleanArchitecture.Blazor.Application.Features.Devices.Caching;
 @using CleanArchitecture.Blazor.Application.Features.Devices.Commands.Delete
 @using CleanArchitecture.Blazor.Application.Features.Devices.DTOs
 @using CleanArchitecture.Blazor.Application.Features.Devices.Queries.Pagination
@@ -268,6 +269,7 @@
     {
         _selectedItems = new();
         _searchString = string.Empty;
+        DeviceCacheKey.Refresh();
         await _table.ReloadServerData();
     }
     private async Task OnCreate()

diff --git a/src/Blazor.Server.UI/Pages/Employees/Employees.razor b/src/Blazor.Server.UI/Pages/Employees/Employees.razor
@@ -1,5 +1,6 @@
 @page "/visitor/employees"
 
+@using CleanArchitecture.Blazor.Application.Features.Employees.Caching;
 @using CleanArchitecture.Blazor.Application.Features.KeyValues.DTOs
 @using CleanArchitecture.Blazor.Application.Features.KeyValues.Queries.ByName
 @using CleanArchitecture.Blazor.Application.Features.Employees.Commands.Delete
@@ -278,6 +279,7 @@
     {
         _selectedItems = new();
         _searchString = string.Empty;
+        EmployeeCacheKey.Refresh();
         await _table.ReloadServerData();
     }
     private async Task OnCreate()

diff --git a/src/Blazor.Server.UI/Pages/SiteConfigurations/SiteConfigurations.razor b/src/Blazor.Server.UI/Pages/SiteConfigurations/SiteConfigurations.razor
@@ -1,6 +1,7 @@
 @page "/visitor/siteconfigurations"
 
 
+@using CleanArchitecture.Blazor.Application.Features.SiteConfigurations.Caching;
 @using CleanArchitecture.Blazor.Application.Features.SiteConfigurations.Commands.Delete
 @using CleanArchitecture.Blazor.Application.Features.SiteConfigurations.DTOs
 @using CleanArchitecture.Blazor.Application.Features.SiteConfigurations.Queries.Pagination
@@ -208,6 +209,7 @@
     {
         _selectedItems = new();
         _searchString = string.Empty;
+        SiteConfigurationCacheKey.Refresh();
         await _table.ReloadServerData();
     }
     private async Task OnCreate()

diff --git a/src/Blazor.Server.UI/Pages/Sites/Sites.razor b/src/Blazor.Server.UI/Pages/Sites/Sites.razor
@@ -1,6 +1,7 @@
 @page "/visitor/sites"
 
 
+@using CleanArchitecture.Blazor.Application.Features.Sites.Caching;
 @using CleanArchitecture.Blazor.Application.Features.Sites.Commands.Delete
 @using CleanArchitecture.Blazor.Application.Features.Sites.DTOs
 @using CleanArchitecture.Blazor.Application.Features.Sites.Queries.Pagination
@@ -255,6 +256,7 @@
     {
         _selectedItems = new();
         _searchString = string.Empty;
+        SiteCacheKey.Refresh();
         await _table.ReloadServerData();
     }
     private async Task OnCreate()

diff --git a/src/Blazor.Server.UI/Pages/Visitors/VisitorHistories.razor b/src/Blazor.Server.UI/Pages/Visitors/VisitorHistories.razor
@@ -1,6 +1,7 @@
 @page "/visitor/visitorhistories"
 
 
+@using CleanArchitecture.Blazor.Application.Features.VisitorHistories.Caching;
 @using CleanArchitecture.Blazor.Application.Features.VisitorHistories.Commands.Delete
 @using CleanArchitecture.Blazor.Application.Features.VisitorHistories.DTOs
 @using CleanArchitecture.Blazor.Application.Features.VisitorHistories.Queries.Pagination
@@ -159,6 +160,7 @@
     {
         _selectedItems = new();
         _searchString = string.Empty;
+        VisitorHistoryCacheKey.Refresh();
         await _table.ReloadServerData();
     }
      private async Task OnDeleteChecked()

diff --git a/src/Blazor.Server.UI/Pages/Visitors/Visitors.razor b/src/Blazor.Server.UI/Pages/Visitors/Visitors.razor
@@ -1,6 +1,7 @@
 @page "/visitor/visitors"
 
 
+@using CleanArchitecture.Blazor.Application.Features.Visitors.Caching;
 @using CleanArchitecture.Blazor.Application.Features.Visitors.Commands.Approve
 @using CleanArchitecture.Blazor.Application.Features.Visitors.Commands.Create
 @using CleanArchitecture.Blazor.Application.Features.Visitors.Commands.Delete
@@ -372,6 +373,7 @@
     {
         _selectedItems = new();
         _searchString = string.Empty;
+        VisitorCacheKey.Refresh();
         await _table.ReloadServerData();
     }
     private async Task OnShowPreview(VisitorDto dto)

diff --git a/src/Domain/Domain.csproj b/src/Domain/Domain.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
@@ -15,21 +15,21 @@
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
     <PackageReference Include="FluentEmail.MailKit" Version="3.0.2" />
     <PackageReference Include="MailKit" Version="4.1.0" />
-    <PackageReference Include="Hangfire.Core" Version="1.8.3" />
+    <PackageReference Include="Hangfire.Core" Version="1.8.4" />
     <PackageReference Include="hashids.net" Version="1.7.0" />
-      <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.8" />
+      <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.9" />
       <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
       <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.0" />
       <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
       <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
     <PackageReference Include="MimeKit" Version="4.1.0" />
     <PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.3" />
     <PackageReference Include="Duende.IdentityServer" Version="6.3.3" />