From fd750c7c0e4577949d822d8a0613d2a046ab150a Mon Sep 17 00:00:00 2001
From: Marie <51697796+ijreilly@users.noreply.github.com>
Date: Fri, 18 Apr 2025 14:02:36 +0200
Subject: [PATCH] Fix metadata cache flush (#11646)

Attempt to fix
https://twenty-v7.sentry.io/issues/6545999328/?environment=prod&project=4507072499810304&query=is%3Aunresolved%20issue.priority%3A%5Bhigh%2C%20medium%5D&referrer=issue-stream&sort=date&stream_index=2
---
 .../services/workspace-metadata-cache.service.ts         | 5 ++++-
 .../workspace-cache-storage.service.ts                   | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts
index 33cccca37..5ae6f7676 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts
@@ -55,7 +55,10 @@ export class WorkspaceMetadataCacheService {
     }
 
     if (currentCacheVersion !== undefined) {
-      this.workspaceCacheStorageService.flush(workspaceId, currentCacheVersion);
+      this.workspaceCacheStorageService.flushVersionedMetadata(
+        workspaceId,
+        currentCacheVersion,
+      );
     }
 
     await this.workspaceCacheStorageService.addObjectMetadataCollectionOngoingCachingLock(
diff --git a/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts b/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts
index 74d33e148..e996c1ab3 100644
--- a/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts
+++ b/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts
@@ -253,7 +253,10 @@ export class WorkspaceCacheStorageService {
     );
   }
 
-  async flush(workspaceId: string, metadataVersion: number): Promise<void> {
+  async flushVersionedMetadata(
+    workspaceId: string,
+    metadataVersion: number,
+  ): Promise<void> {
     await this.cacheStorageService.del(
       `${WorkspaceCacheKeys.MetadataObjectMetadataMaps}:${workspaceId}:${metadataVersion}`,
     );
@@ -272,6 +275,10 @@ export class WorkspaceCacheStorageService {
     await this.cacheStorageService.del(
       `${WorkspaceCacheKeys.MetadataObjectMetadataOngoingCachingLock}:${workspaceId}:${metadataVersion}`,
     );
+  }
+
+  async flush(workspaceId: string, metadataVersion: number): Promise<void> {
+    await this.flushVersionedMetadata(workspaceId, metadataVersion);
 
     await this.cacheStorageService.del(
       `${WorkspaceCacheKeys.MetadataPermissionsRolesPermissions}:${workspaceId}`,