From 0702d3892f3f3c3b7603b22167dc33ac175ac480 Mon Sep 17 00:00:00 2001
From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com>
Date: Sat, 29 Jun 2024 17:20:55 +0300
Subject: [PATCH] Refactor password filtering and mapping logic

---
 src/door-lock/services/door.lock.service.ts | 28 +++++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/door-lock/services/door.lock.service.ts b/src/door-lock/services/door.lock.service.ts
index d60c4bd..09cd80f 100644
--- a/src/door-lock/services/door.lock.service.ts
+++ b/src/door-lock/services/door.lock.service.ts
@@ -168,18 +168,24 @@ export class DoorLockService {
 
       if (passwords.result.length > 0) {
         const passwordFiltered = passwords.result
-          .filter((item) => item.schedule_list && item.schedule_list.length > 0)
+          .filter((item) => item.type === 1)
           .map((password: any) => {
-            password.schedule_list = password.schedule_list.map((schedule) => {
-              schedule.working_day = this.getDaysFromWorkingDayValue(
-                schedule.working_day,
+            if (password.schedule_list?.length > 0) {
+              password.schedule_list = password.schedule_list.map(
+                (schedule) => {
+                  schedule.working_day = this.getDaysFromWorkingDayValue(
+                    schedule.working_day,
+                  );
+                  schedule.effective_time = this.minutesToTime(
+                    schedule.effective_time,
+                  );
+                  schedule.invalid_time = this.minutesToTime(
+                    schedule.invalid_time,
+                  );
+                  return schedule;
+                },
               );
-              schedule.effective_time = this.minutesToTime(
-                schedule.effective_time,
-              );
-              schedule.invalid_time = this.minutesToTime(schedule.invalid_time);
-              return schedule;
-            });
+            }
             return password;
           });
 
@@ -343,7 +349,7 @@ export class DoorLockService {
         addDeviceObj,
         passwordData.deviceTuyaUuid,
         type,
-        isOnline,
+        addDeviceObj.scheduleList ? isOnline : false,
       );
 
       if (!createPass.success) {