From 5a41c66953acf80da64c3e450f963e60f380e603 Mon Sep 17 00:00:00 2001 From: Nawaz Dhandala Date: Tue, 11 Nov 2025 13:26:02 +0000 Subject: [PATCH] refactor(DatabaseBaseModel, ColorField): improve formatting and readability of type definitions and method implementations --- .../DatabaseBaseModel/DatabaseBaseModel.ts | 2 +- Common/Types/Database/ColorField.ts | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts b/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts index 7acb5a0ebb..c5094b4d86 100644 --- a/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts +++ b/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts @@ -205,7 +205,7 @@ export default class DatabaseBaseModel extends BaseEntity { } public getFirstColorColumn(): string | null { - return getFirstColorFieldColumn(this); + return getFirstColorFieldColumn(this); } public canQueryMultiTenant(): boolean { diff --git a/Common/Types/Database/ColorField.ts b/Common/Types/Database/ColorField.ts index 7a3b7001ce..ce5b3ca765 100644 --- a/Common/Types/Database/ColorField.ts +++ b/Common/Types/Database/ColorField.ts @@ -4,9 +4,13 @@ import "reflect-metadata"; const colorFieldSymbol: symbol = Symbol("ColorField"); -type ColorFieldColumnsFunction = (target: T) => Array; +type ColorFieldColumnsFunction = ( + target: T, +) => Array; -type FirstColorFieldColumnFunction = (target: T) => string | null; +type FirstColorFieldColumnFunction = ( + target: T, +) => string | null; type IsColorFieldColumnFunction = ( target: T, @@ -17,14 +21,18 @@ const ColorField = (): ReflectionMetadataType => { return Reflect.metadata(colorFieldSymbol, true); }; -export const isColorFieldColumn: IsColorFieldColumnFunction = ( +export const isColorFieldColumn: IsColorFieldColumnFunction = < + T extends BaseModel, +>( target: T, propertyKey: string, ): boolean => { return Boolean(Reflect.getMetadata(colorFieldSymbol, target, propertyKey)); }; -export const getColorFieldColumns: ColorFieldColumnsFunction = ( +export const getColorFieldColumns: ColorFieldColumnsFunction = < + T extends BaseModel, +>( target: T, ): Array => { const columns: Array = []; @@ -39,7 +47,9 @@ export const getColorFieldColumns: ColorFieldColumnsFunction = ( +export const getFirstColorFieldColumn: FirstColorFieldColumnFunction = < + T extends BaseModel, +>( target: T, ): string | null => { const columns: Array = getColorFieldColumns(target);