Remove unnecessary caching in repository methods

Laixer · Aug 8, 2024 · b809bed · b809bed
1 parent 306103f
commit b809bed
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 34 deletions.
diff --git a/src/FunderMaps.Data/Repositories/IncidentRepository.cs b/src/FunderMaps.Data/Repositories/IncidentRepository.cs
@@ -201,7 +201,7 @@ FROM    report.incident AS i
 
     public override async Task UpdateAsync(Incident entity)
     {
-        ResetCacheEntity(entity);
+        Cache.Remove(entity.Id);
 
         var sql = @"
             UPDATE  report.incident

diff --git a/src/FunderMaps.Data/Repositories/InquiryRepository.cs b/src/FunderMaps.Data/Repositories/InquiryRepository.cs
@@ -345,7 +345,7 @@ FROM    report.inquiry_sample AS s
 
     public override async Task UpdateAsync(Inquiry entity)
     {
-        ResetCacheEntity(entity);
+        Cache.Remove(entity.Id);
 
         var sql = @"
             -- Attribution
@@ -388,7 +388,7 @@ FROM 	application.attribution AS a
 
     public async Task SetAuditStatusAsync(int id, Inquiry entity, Guid tenantId)
     {
-        ResetCacheEntity(id);
+        Cache.Remove(id);
 
         var sql = @"
             UPDATE  report.inquiry AS i

diff --git a/src/FunderMaps.Data/Repositories/InquirySampleRepository.cs b/src/FunderMaps.Data/Repositories/InquirySampleRepository.cs
@@ -199,7 +199,7 @@ FROM    report.inquiry_sample AS s
 
     public async Task DeleteAsync(int id, Guid tenantId)
     {
-        ResetCacheEntity(id);
+        Cache.Remove(id);
 
         var sql = @"
             DELETE
@@ -765,7 +765,7 @@ FROM    report.inquiry_sample AS s
 
     public async Task UpdateAsync(InquirySample entity, Guid tenantId)
     {
-        ResetCacheEntity(entity);
+        Cache.Remove(entity.Id);
 
         var sql = @"
             UPDATE  report.inquiry_sample AS s

diff --git a/src/FunderMaps.Data/Repositories/OrganizationRepository.cs b/src/FunderMaps.Data/Repositories/OrganizationRepository.cs
@@ -21,7 +21,7 @@ SELECT  COUNT(*)
 
     public override async Task DeleteAsync(Guid id)
     {
-        ResetCacheEntity(id);
+        Cache.Remove(id);
 
         var sql = @"
             DELETE
@@ -94,7 +94,7 @@ public async IAsyncEnumerable<Organization> ListAllAsync(Navigation navigation)
 
     public override async Task UpdateAsync(Organization entity)
     {
-        ResetCacheEntity(entity);
+        Cache.Remove(entity.Id);
 
         var sql = @"
             UPDATE  application.organization

diff --git a/src/FunderMaps.Data/Repositories/RecoveryRepository.cs b/src/FunderMaps.Data/Repositories/RecoveryRepository.cs
@@ -118,7 +118,7 @@ SELECT  COUNT(*)
 
     public async Task DeleteAsync(int id, Guid tenantId)
     {
-        ResetCacheEntity(id);
+        Cache.Remove(id);
 
         var sql = @"
             DELETE
@@ -317,7 +317,7 @@ FROM    report.recovery_sample AS s
 
     public override async Task UpdateAsync(Recovery entity)
     {
-        ResetCacheEntity(entity);
+        Cache.Remove(entity.Id);
 
         var sql = @"
             -- Attribution
@@ -356,7 +356,7 @@ FROM 	application.attribution AS a
 
     public async Task SetAuditStatusAsync(int id, Recovery entity, Guid tenantId)
     {
-        ResetCacheEntity(id);
+        Cache.Remove(id);
 
         var sql = @"
             UPDATE  report.recovery AS r

diff --git a/src/FunderMaps.Data/Repositories/UserRepository.cs b/src/FunderMaps.Data/Repositories/UserRepository.cs
@@ -48,7 +48,7 @@ SELECT  COUNT(*)
     //         a ReferenceNotFoundException, which is invalid.
     public override async Task DeleteAsync(Guid id)
     {
-        ResetCacheEntity(id);
+        Cache.Remove(id);
 
         var sql = @"
             DELETE
@@ -233,7 +233,7 @@ public async IAsyncEnumerable<User> ListAllAsync(Navigation navigation)
 
     public override async Task UpdateAsync(User entity)
     {
-        ResetCacheEntity(entity);
+        Cache.Remove(entity.Id);
 
         var sql = @"
             UPDATE  application.user

diff --git a/src/FunderMaps.Data/RepositoryBase.cs b/src/FunderMaps.Data/RepositoryBase.cs
@@ -13,23 +13,6 @@ namespace FunderMaps.Data;
 internal abstract class RepositoryBase<TEntity, TEntityPrimaryKey> : DbServiceBase, IAsyncRepository<TEntity, TEntityPrimaryKey>
     where TEntity : IEntityIdentifier<TEntityPrimaryKey>
 {
-    /// <summary>
-    ///     Remove entity from cache.
-    /// </summary>
-    protected void ResetCacheEntity(TEntityPrimaryKey key)
-    {
-        if (key is not null)
-        {
-            Cache.Remove(key);
-        }
-    }
-
-    /// <summary>
-    ///     Remove entity from cache.
-    /// </summary>
-    protected void ResetCacheEntity(TEntity value)
-        => ResetCacheEntity(value.Id);
-
     // TODO: Remove
     // FUTURE: Maybe too npgsql specific.
     // FUTURE: Extension ?

diff --git a/tests/FunderMaps.Webservice.Tests/FunderMapsWebApplicationFactory.cs b/tests/FunderMaps.Webservice.Tests/FunderMapsWebApplicationFactory.cs
@@ -265,11 +265,6 @@ async Task<User> IAsyncRepository<User, Guid>.GetByIdAsync(Guid id)
     {
         return await GetByIdAsync(id);
     }
-
-    // IAsyncEnumerable<User> IAsyncRepository<User, Guid>.ListAllAsync(Navigation navigation)
-    // {
-    //     return ListAllAsync(navigation);
-    // }
 }
 
 internal class MemoryOrganizationRepository : MemoryRepositoryBase<Organization, Guid>, IOrganizationRepository