resolve conflicts

src/device/services/device.service.ts

@@ -64,6 +64,7 @@ export class DeviceService {
     return await this.deviceRepository.findOne({
       where: {
         uuid: deviceUuid,
+        isActive: true,
       },
       ...(withProductDevice && { relations: ['productDevice'] }),
     });
@@ -72,6 +73,7 @@ export class DeviceService {
     return await this.deviceRepository.findOne({
       where: {
         deviceTuyaUuid,
+        isActive: true,
       },
       relations: ['productDevice'],
     });
@@ -128,6 +130,7 @@ export class DeviceService {
       const devices = await this.deviceRepository.find({
         where: {
           user: { uuid: userUuid },
+          isActive: true,
           permission: {
             userUuid,
             permissionType: {
@@ -174,6 +177,7 @@ export class DeviceService {
       const devices = await this.deviceRepository.find({
         where: {
           spaceDevice: { uuid: getDeviceByRoomUuidDto.roomUuid },
+          isActive: true,
           permission: {
             userUuid,
             permissionType: {
@@ -223,6 +227,7 @@ export class DeviceService {
       const device = await this.deviceRepository.findOne({
         where: {
           uuid: updateDeviceInRoomDto.deviceUuid,
+          isActive: true,
         },
         relations: ['spaceDevice', 'spaceDevice.parent'],
       });
@@ -409,7 +414,7 @@ export class DeviceService {
   }
   async checkAllDevicesHaveSameProductUuid(deviceUuids: string[]) {
     const firstDevice = await this.deviceRepository.findOne({
-      where: { uuid: deviceUuids[0] },
+      where: { uuid: deviceUuids[0], isActive: true },
       relations: ['productDevice'],
     });
 
@@ -421,7 +426,7 @@ export class DeviceService {
 
     for (let i = 1; i < deviceUuids.length; i++) {
       const device = await this.deviceRepository.findOne({
-        where: { uuid: deviceUuids[i] },
+        where: { uuid: deviceUuids[i], isActive: true },
         relations: ['productDevice'],
       });
 
@@ -465,6 +470,11 @@ export class DeviceService {
           if (operationResult.success) {
             // Add to success results if operationResult.success is true
             successResults.push({ deviceUuid, result: operationResult });
+            // Update isActive to false in the repository for the successfully reset device
+            await this.deviceRepository.update(
+              { uuid: deviceUuid },
+              { isActive: false },
+            );
           } else {
             // Add to failed results if operationResult.success is false
             failedResults.push({ deviceUuid, error: operationResult.msg });
@@ -645,6 +655,7 @@ export class DeviceService {
     const device = await this.deviceRepository.findOne({
       where: {
         uuid: deviceUuid,
+        isActive: true,
         permission: {
           userUuid: userUuid,
         },
@@ -669,19 +680,25 @@ export class DeviceService {
 
       const devices = await Promise.all(
         response.map(async (device: any) => {
-          const deviceDetails = await this.getDeviceByDeviceTuyaUuid(device.id);
-          if (deviceDetails.deviceTuyaUuid) {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const { id, ...rest } = device;
-            return {
-              ...rest,
-              tuyaUuid: deviceDetails.deviceTuyaUuid,
-              uuid: deviceDetails.uuid,
-              productUuid: deviceDetails.productDevice.uuid,
-              productType: deviceDetails.productDevice.prodType,
-            };
+          try {
+            const deviceDetails = await this.getDeviceByDeviceTuyaUuid(
+              device.id,
+            );
+            if (deviceDetails.deviceTuyaUuid) {
+              // eslint-disable-next-line @typescript-eslint/no-unused-vars
+              const { id, ...rest } = device;
+              return {
+                ...rest,
+                tuyaUuid: deviceDetails.deviceTuyaUuid,
+                uuid: deviceDetails.uuid,
+                productUuid: deviceDetails.productDevice.uuid,
+                productType: deviceDetails.productDevice.prodType,
+              };
+            }
+            return null;
+          } catch (error) {
+            return null;
           }
-          return null;
         }),
       );
 
@@ -770,6 +787,9 @@ export class DeviceService {
           parent: {
             uuid: unitUuid,
           },
+          devicesSpaceEntity: {
+            isActive: true,
+          },
         },
         relations: ['devicesSpaceEntity', 'devicesSpaceEntity.productDevice'],
       });
@@ -804,6 +824,7 @@ export class DeviceService {
   async getAllDevices(): Promise<GetDeviceDetailsInterface[]> {
     try {
       const devices = await this.deviceRepository.find({
+        where: { isActive: true },
         relations: [
           'spaceDevice.parent',
           'productDevice',