Merge pull request #4548 from sbwalker/dev

fix #4546 - handle cache invalidation for site deletion
oqtane · Aug 22, 2024 · aa435d6 · aa435d6
2 parents 437aa45 + f6858c2
commit aa435d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Oqtane.Server/Infrastructure/EventSubscribers/CacheInvalidationEventSubscriber.cs b/Oqtane.Server/Infrastructure/EventSubscribers/CacheInvalidationEventSubscriber.cs
@@ -24,7 +24,7 @@ public void EntityChanged(SyncEvent syncEvent)
             }
 
             // when a site entity is updated, the hosting model may have changed so the client assemblies cache items need to be refreshed
-            if (syncEvent.EntityName == EntityNames.Site && syncEvent.Action == SyncEventActions.Update)
+            if (syncEvent.EntityName == EntityNames.Site && (syncEvent.Action == SyncEventActions.Update || syncEvent.Action == SyncEventActions.Delete))
             {
                 _cache.Remove($"assemblieslist:{syncEvent.TenantId}:{syncEvent.EntityId}");
                 _cache.Remove($"assemblies:{syncEvent.TenantId}:{syncEvent.EntityId}");

diff --git a/Oqtane.Server/Services/SiteService.cs b/Oqtane.Server/Services/SiteService.cs
@@ -235,6 +235,7 @@ public Task DeleteSiteAsync(int siteId)
                 {
                     _sites.DeleteSite(siteId);
                     _syncManager.AddSyncEvent(alias, EntityNames.Site, site.SiteId, SyncEventActions.Delete);
+                    _syncManager.AddSyncEvent(alias, EntityNames.Site, site.SiteId, SyncEventActions.Refresh);
                     _logger.Log(siteId, LogLevel.Information, this, LogFunction.Delete, "Site Deleted {SiteId}", siteId);
                 }
                 else