From 6b66bf2b20d232bfc749d5bf20fa592f32532a79 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sun, 24 Nov 2024 16:09:21 -0600 Subject: [PATCH] fix automation get endpoint remove return Auto_ --- libs/common/src/constants/automation.enum.ts | 3 ++- src/automation/services/automation.service.ts | 20 +++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libs/common/src/constants/automation.enum.ts b/libs/common/src/constants/automation.enum.ts index e9bb6a8..8370cf9 100644 --- a/libs/common/src/constants/automation.enum.ts +++ b/libs/common/src/constants/automation.enum.ts @@ -1,4 +1,3 @@ -// automation.enum.ts export enum ActionExecutorEnum { DEVICE_ISSUE = 'device_issue', DELAY = 'delay', @@ -17,3 +16,5 @@ export const AUTOMATION_CONFIG = { COMPARATOR: '==', SCENE_STATUS_VALUE: 'scene', }; +export const AUTOMATION_TYPE = 'automation'; +export const AUTO_PREFIX = 'Auto_'; diff --git a/src/automation/services/automation.service.ts b/src/automation/services/automation.service.ts index 27d1b6a..9c805f3 100644 --- a/src/automation/services/automation.service.ts +++ b/src/automation/services/automation.service.ts @@ -26,6 +26,8 @@ import { import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter'; import { ActionExecutorEnum, + AUTO_PREFIX, + AUTOMATION_TYPE, EntityTypeEnum, } from '@app/common/constants/automation.enum'; import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service'; @@ -154,14 +156,16 @@ export class AutomationService { throw new HttpException(response.msg, HttpStatus.BAD_REQUEST); } - return response.result.list.map((item) => { - return { - id: item.id, - name: item.name, - status: item.status, - type: 'automation', - }; - }); + return response.result.list + .filter((item) => item.name && !item.name.startsWith(AUTO_PREFIX)) + .map((item) => { + return { + id: item.id, + name: item.name, + status: item.status, + type: AUTOMATION_TYPE, + }; + }); } catch (err) { if (err instanceof BadRequestException) { throw err; // Re-throw BadRequestException