cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-20 06:29:07 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix: change api endpoint (#1183)

Browse Source 
* remove async from parseProperty

* swap shouldThrottle check

Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>

---------

Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>
This commit is contained in:
Alex Christoffer Rasmussen
2024-08-20 11:22:02 +02:00
committed by GitHub
parent 340f5478fb
commit 1b1823e0fe
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/api-integration/integration.controller.ts
+8 -11
View File
@@ -54,18 +54,15 @@ const actionHandlers: Record<string, ActionHandler> = {
if (typeof property !== 'string' || value === undefined) { if (typeof property !== 'string' || value === undefined) {
throw new Error('Invalid property or value'); throw new Error('Invalid property or value');
} }
// parseProperty is async because of the data lock // parseProperty is async because of the data lock
parseProperty(property, value).then((newObjectProperty) => { const newObjectProperty = parseProperty(property, value);
const key = Object.keys(newObjectProperty)[0] as keyof OntimeEvent; const key = Object.keys(newObjectProperty)[0] as keyof OntimeEvent;
shouldThrottle = willCauseRegeneration(key) || shouldThrottle; shouldThrottle = shouldThrottle || willCauseRegeneration(key);
if (patchEvent.custom && newObjectProperty.custom) {
if (patchEvent.custom && newObjectProperty.custom) { Object.assign(patchEvent.custom, newObjectProperty.custom);
Object.assign(patchEvent.custom, newObjectProperty.custom); } else {
} else { Object.assign(patchEvent, newObjectProperty);
Object.assign(patchEvent, newObjectProperty); }
}
});
}); });
if (shouldThrottle) { if (shouldThrottle) {
apps/server/src/api-integration/integration.utils.ts
+1 -1
View File
@@ -42,7 +42,7 @@ const propertyConversion = {
timeEnd: (value: unknown) => clampDuration(coerceNumber(value)), timeEnd: (value: unknown) => clampDuration(coerceNumber(value)),
}; };
export async function parseProperty(property: string, value: unknown) { export function parseProperty(property: string, value: unknown) {
if (property.startsWith('custom:')) { if (property.startsWith('custom:')) {
const customKey = property.split(':')[1].toLocaleLowerCase(); // all custom fields keys are lowercase const customKey = property.split(':')[1].toLocaleLowerCase(); // all custom fields keys are lowercase
const customFields = getDataProvider().getCustomFields(); const customFields = getDataProvider().getCustomFields();