cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-17 05:13:32 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: handle boolean comparisons

Browse Source
This commit is contained in:
Carlos Valente
2025-01-22 20:23:50 +01:00
committed by Carlos Valente
parent 8ba65fa2bd
commit eb0e5e6420
3 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/api-data/automation/automation.utils.ts
+38 -18
View File
@@ -79,7 +79,8 @@ export function parseTemplateNested(template: string, state: object, humanReadab
value = undefined;
}
} else {
value = getPropertyFromPath(variableName, state);
// we cast to string since this will be used in a string context
value = getPropertyFromPath(variableName, state) as string;
}
if (value !== undefined) {
parsedTemplate = parsedTemplate.replace(match[0], value);
@@ -140,17 +141,18 @@ const quickAliases: AliasesDefinition = {
* @example isGreaterThan('5', '10') // false
* @example isGreaterThan('Ontime', 'Cool') // false
*/
export function isGreaterThan(a: string, b: string): boolean {
const aValue = Number(a);
const bValue = Number(b);
// we check if the values encore numbers and compare them
if (!isNaN(aValue) && !isNaN(bValue)) {
return aValue > bValue;
export function isGreaterThan(a: unknown, b: string): boolean {
// If either value is not a number, there is no logical comparison to be made
if (typeof a !== 'number') {
return false;
}
// If either value is not a number, there is no logical comparison to be made
return false;
const bValue = Number(b);
if (isNaN(bValue)) {
return false;
}
return a > bValue;
}
/**
@@ -159,15 +161,33 @@ export function isGreaterThan(a: string, b: string): boolean {
* @example isLessThan('5', '10') // true
* @example isLessThan('Ontime', 'Cool') // false
*/
export function isLessThan(a: string, b: string): boolean {
const aValue = Number(a);
const bValue = Number(b);
// we check if the values encore numbers and compare them
if (!isNaN(aValue) && !isNaN(bValue)) {
return aValue < bValue;
export function isLessThan(a: unknown, b: string): boolean {
// If either value is not a number, there is no logical comparison to be made
if (typeof a !== 'number') {
return false;
}
// If either value is not a number, there is no logical comparison to be made
const bValue = Number(b);
if (isNaN(bValue)) {
return false;
}
return a < bValue;
}
/**
* Utility encapsulates logic for comparing two strings which may encode booleans
* @example isBooleanEquals(true, 'true') // true
* @example isBooleanEquals(true, 'false') // false
* @example isBooleanEquals(true, 'something') // false
*/
export function isBooleanEquals(a: boolean, b: string): boolean {
if (b === 'true') {
return a === true;
}
if (b === 'false') {
return a === false;
}
return false;
}