From 6b8aa6836d31a6afa1758b320fc843f2bae20cf2 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Sun, 27 Apr 2025 22:42:03 +0400
Subject: [PATCH] fixed commission device

---
 .../services/commission-device.service.ts                | 9 +++++++++
 src/space/handlers/disable-space.handler.ts              | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/commission-device/services/commission-device.service.ts b/src/commission-device/services/commission-device.service.ts
index ed79839..d118e2c 100644
--- a/src/commission-device/services/commission-device.service.ts
+++ b/src/commission-device/services/commission-device.service.ts
@@ -83,6 +83,7 @@ export class DeviceCommissionService {
       const tagName = row['Tag']?.trim();
       const productName = row['Product Name']?.trim();
       const projectId = param.projectUuid;
+      let deviceName: string;
 
       if (!rawDeviceId) {
         console.error('Missing Device ID in row:', row);
@@ -97,6 +98,10 @@ export class DeviceCommissionService {
         return;
       }
 
+      if (device && typeof device === 'object' && 'name' in device) {
+        deviceName = (device as any).name || '';
+      }
+
       const community = await this.communityRepository.findOne({
         where: { uuid: communityId, project: { uuid: projectId } },
       });
@@ -189,6 +194,7 @@ export class DeviceCommissionService {
         subspace: subspace || null,
         productDevice: match.product,
         tag: match.tag,
+        name: deviceName ?? '',
       });
 
       await this.deviceRepository.save(middlewareDevice);
@@ -198,6 +204,9 @@ export class DeviceCommissionService {
         tuyaSpaceId,
       );
       successCount.value++;
+      console.log(
+        `Device ${rawDeviceId} successfully processed and transferred to Tuya space ${tuyaSpaceId}`,
+      );
     } catch (err) {
       failureCount.value++;
     }
diff --git a/src/space/handlers/disable-space.handler.ts b/src/space/handlers/disable-space.handler.ts
index 1dea9ca..10f18d9 100644
--- a/src/space/handlers/disable-space.handler.ts
+++ b/src/space/handlers/disable-space.handler.ts
@@ -40,7 +40,6 @@ export class DisableSpaceHandler
         relations: [
           'subspaces',
           'parent',
-          'tags',
           'devices',
           'outgoingConnections',
           'incomingConnections',