From 3e1b4ace374eebc97b7d03ca0249dbeb851d815b Mon Sep 17 00:00:00 2001 From: Paul Rastoin <45004772+prastoin@users.noreply.github.com> Date: Fri, 2 May 2025 11:07:12 +0200 Subject: [PATCH] Standardize `isDefined` usage for metadata version assertions (#11829) # Introduction `!value` is risky as `!falsy` would return `true` --- .../relation/field-metadata-relation.service.ts | 4 +++- .../relation-metadata/relation-metadata.service.ts | 2 +- .../services/workspace-metadata-cache.service.ts | 3 ++- .../services/workspace-metadata-version.service.ts | 3 ++- .../twenty-orm/factories/workspace-datasource.factory.ts | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/relation/field-metadata-relation.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/relation/field-metadata-relation.service.ts index ce9a2789a..40692c17f 100644 --- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/relation/field-metadata-relation.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/relation/field-metadata-relation.service.ts @@ -1,5 +1,7 @@ import { Injectable } from '@nestjs/common'; +import { isDefined } from 'twenty-shared/utils'; + import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface'; import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; @@ -40,7 +42,7 @@ export class FieldMetadataRelationService { const metadataVersion = await this.workspaceCacheStorageService.getMetadataVersion(workspaceId); - if (!metadataVersion) { + if (!isDefined(metadataVersion)) { throw new FieldMetadataException( `Metadata version not found for workspace ${workspaceId}`, FieldMetadataExceptionCode.INTERNAL_SERVER_ERROR, diff --git a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts index 0a67c7ff9..2e767e5da 100644 --- a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts @@ -537,7 +537,7 @@ export class RelationMetadataService extends TypeOrmQueryService