From 3aff8d59d20beaba1483a548a745dd7dbf6f83d8 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Tue, 13 Aug 2024 01:41:01 +0300 Subject: [PATCH] Refactor DoorLockService to standardize password property names --- src/door-lock/services/door.lock.service.ts | 35 +++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/door-lock/services/door.lock.service.ts b/src/door-lock/services/door.lock.service.ts index 7a3cd72..3175bd7 100644 --- a/src/door-lock/services/door.lock.service.ts +++ b/src/door-lock/services/door.lock.service.ts @@ -114,12 +114,12 @@ export class DoorLockService { return fromVisitor ? convertKeysToCamelCase(passwords.result.records).map((password) => { return { - passwodId: `${password.pwdId}`, - passwodExpired: `${password.gmtExpired}`, - passwordStart: `${password.gmtStart}`, + passwordId: `${password.pwdId}`, + invalidTime: `${password.gmtExpired}`, + effectiveTime: `${password.gmtStart}`, passwordCreated: `${password.gmtCreate}`, - passwodName: password.pwdName, - passwordStatus: password.status, + createdTime: password.pwdName, + passwordStatus: `${password.status}`, passwordType: 'OFFLINE_MULTIPLE', deviceUuid: doorLockUuid, }; @@ -160,12 +160,12 @@ export class DoorLockService { return fromVisitor ? convertKeysToCamelCase(passwords.result.records).map((password) => { return { - passwodId: `${password.pwdId}`, - passwodExpired: `${password.gmtExpired}`, - passwordStart: `${password.gmtStart}`, - passwordCreated: `${password.gmtCreate}`, - passwodName: password.pwdName, - passwordStatus: password.status, + passwordId: `${password.pwdId}`, + invalidTime: `${password.gmtExpired}`, + effectiveTime: `${password.gmtStart}`, + createdTime: `${password.gmtCreate}`, + passwordName: password.pwdName, + passwordStatus: `${password.status}`, passwordType: 'OFFLINE_ONETIME', deviceUuid: doorLockUuid, }; @@ -226,9 +226,10 @@ export class DoorLockService { ? convertKeysToCamelCase(passwordFiltered).map((password) => { return { passwodId: `${password.id}`, - passwodExpired: `${password.invalidTime}`, - passwordStart: `${password.effectiveTime}`, - passwordCreated: '', + invalidTime: `${password.invalidTime}`, + effectiveTime: `${password.effectiveTime}`, + createdTime: '', + scheduleList: password?.scheduleList, passwodName: password.name, passwordStatus: '', passwordType: 'ONLINE_MULTIPLE', @@ -293,9 +294,9 @@ export class DoorLockService { ? convertKeysToCamelCase(passwordFiltered).map((password) => { return { passwodId: `${password.id}`, - passwodExpired: `${password.invalidTime}`, - passwordStart: `${password.effectiveTime}`, - passwordCreated: '', + invalidTime: `${password.invalidTime}`, + effectiveTime: `${password.effectiveTime}`, + createdTime: '', passwodName: password.name, passwordStatus: '', passwordType: 'ONLINE_ONETIME',