admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: query runner orm (#6397)

Browse Source 
Fix WorkspaceQueryRunner events using TwentyORM

Fix #6057

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Jérémy M
2024-07-25 13:21:57 +02:00
committed by GitHub
parent c3cdb664be
commit d0201e17ac
2 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts
View File

@ -28,23 +28,15 @@ export class WorkspaceDatasourceFactory {
workspaceId: string,
cacheVersion: string | null,
): Promise<WorkspaceDataSource> {
let dataSourceCacheVersion: string;
cacheVersion ??=
await this.workspaceCacheVersionService.getVersion(workspaceId);
if (cacheVersion) {
dataSourceCacheVersion = cacheVersion;
} else {
const cacheVersionFromDatabase =
await this.workspaceCacheVersionService.getVersion(workspaceId);
if (!cacheVersionFromDatabase) {
throw new Error('Cache version not found');
}
dataSourceCacheVersion = cacheVersionFromDatabase;
if (!cacheVersion) {
throw new Error('Cache version not found');
}
const workspaceDataSource = await workspaceDataSourceCacheInstance.execute(
`${workspaceId}-${dataSourceCacheVersion}`,
`${workspaceId}-${cacheVersion}`,
async () => {
const dataSourceMetadata =
await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceId(
@ -58,7 +50,7 @@ export class WorkspaceDatasourceFactory {
const latestCacheVersion =
await this.workspaceCacheVersionService.getVersion(workspaceId);
if (latestCacheVersion !== dataSourceCacheVersion) {
if (latestCacheVersion !== cacheVersion) {
throw new Error('Cache version mismatch');
}