From 42b849b3c5a48bdcc064470fdcfee490c9ef154a Mon Sep 17 00:00:00 2001
From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com>
Date: Sun, 2 Jun 2024 15:21:07 +0300
Subject: [PATCH] Refactor code to remove duplicate code and improve
 readability

---
 src/device/services/device.service.ts | 4 ++--
 src/unit/services/unit.service.ts     | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts
index b6e1b6c..d48a65e 100644
--- a/src/device/services/device.service.ts
+++ b/src/device/services/device.service.ts
@@ -103,7 +103,6 @@ export class DeviceService {
       const devicesData = await Promise.all(
         devices.map(async (device) => {
           return {
-            uuid: device.uuid,
             haveRoom: device.spaceDevice ? true : false,
             productUuid: device.productDevice.uuid,
             productType: device.productDevice.prodType,
@@ -111,6 +110,7 @@ export class DeviceService {
             ...(await this.getDeviceDetailsByDeviceIdTuya(
               device.deviceTuyaUuid,
             )),
+            uuid: device.uuid,
           } as GetDeviceDetailsInterface;
         }),
       );
@@ -149,7 +149,6 @@ export class DeviceService {
       const devicesData = await Promise.all(
         devices.map(async (device) => {
           return {
-            uuid: device.uuid,
             haveRoom: device.spaceDevice ? true : false,
             productUuid: device.productDevice.uuid,
             productType: device.productDevice.prodType,
@@ -157,6 +156,7 @@ export class DeviceService {
             ...(await this.getDeviceDetailsByDeviceIdTuya(
               device.deviceTuyaUuid,
             )),
+            uuid: device.uuid,
           } as GetDeviceDetailsInterface;
         }),
       );
diff --git a/src/unit/services/unit.service.ts b/src/unit/services/unit.service.ts
index 449aaa1..f0472af 100644
--- a/src/unit/services/unit.service.ts
+++ b/src/unit/services/unit.service.ts
@@ -303,8 +303,6 @@ export class UnitService {
         type: updatedUnit.spaceType.type,
       };
     } catch (err) {
-      console.log('err', err);
-
       if (err instanceof BadRequestException) {
         throw err;
       } else {