dt-common-device 5.1.4 → 5.1.6

package/dist/entities/admin/Admin.repository.js

@@ -94,47 +94,45 @@ let AdminRepository = (() => {
        INNER JOIN "dt_zones" "z" ON "zc"."zoneId" = "z"."id"
        WHERE "zc"."collectionId" = ANY($1)`, [accessGroupIds]);
             const response = result.rows;
-            const _zones = (nestedZones, allzones = []) => {
+            const _zones = (nestedZones, allZones = []) => {
                 nestedZones.forEach((z) => {
                     const onlyZone = { ...z };
                     delete onlyZone.childZones;
-                    allzones.push(onlyZone);
+                    allZones.push(onlyZone);
                     if (!Array.isArray(z.childZones)) {
                         if (z.childZones.id)
                             z.childZones = [z.childZones];
                     }
                     if (z.childZones.length) {
-                        _zones(z.childZones, allzones);
+                        _zones(z.childZones, allZones);
                     }
                 });
-                return allzones.map((e) => e.id);
+                return allZones.map((e) => e.id);
             };
-            // const zones = _zones(response);
-            const zoneIds = response.map((el) => el.id);
             const collectionZone = [];
-            for (let i = 0; i < response.length; i++) {
+            for (let zone of response) {
                 let zoneIds = [];
-                const zones = await this.axiosInstance.get(`/zones/child?zoneId=${response[i].zoneId}`).data.data;
-                zoneIds.push(response[i].zoneId);
+                const zones = (await this.axiosInstance.get(`/zones/child?zoneId=${zone.zoneId}`))?.data?.data;
+                zoneIds.push(zone.zoneId);
                 if (zones.childZones?.length > 0) {
                     const nestedZoneIds = new Set(_zones(zones.childZones));
                     zoneIds = [...zoneIds, ...nestedZoneIds];
                 }
                 if (collectionZone.length == 0) {
                     const obj = {
-                        collectionId: response[i].collectionId,
+                        collectionId: zone.collectionId,
                         zoneIds,
                     };
                     collectionZone.push(obj);
                 }
                 else {
-                    const obj = collectionZone.find((e) => e.collectionId == response[i].collectionId);
+                    const obj = collectionZone.find((e) => e.collectionId == zone.collectionId);
                     if (obj) {
                         obj.zoneIds = [...obj.zoneIds, ...zoneIds];
                     }
                     else {
                         collectionZone.push({
-                            collectionId: response[i].collectionId,
+                            collectionId: zone.collectionId,
                             zoneIds,
                         });
                     }
@@ -145,7 +143,7 @@ let AdminRepository = (() => {
             });
             if (_zoneIds.length === 0)
                 return [];
-            const deviecDetail = await this.deviceRepository.queryDevices({
+            const deviceDetails = await this.deviceRepository.queryDevices({
                 zoneIds: _zoneIds,
                 excludeDeviceType: interfaces_1.DeviceType.HUB,
             });
@@ -153,7 +151,7 @@ let AdminRepository = (() => {
                 const zones = e.zoneIds;
                 let devices = [];
                 zones.forEach((element) => {
-                    const device = deviecDetail.filter((d) => d.zoneId == element);
+                    const device = deviceDetails.filter((d) => d.zoneId == element);
                     // Add collectionId to each device
                     device.forEach((dev) => {
                         dev.collectionId = e.collectionId;

package/dist/entities/admin/Admin.service.d.ts

@@ -1,5 +1,5 @@
 export declare class AdminService {
     private readonly adminRepository;
     constructor();
-    getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[]>;
+    getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[] | undefined>;
 }

package/dist/entities/admin/Admin.service.js

@@ -11,7 +11,12 @@ class AdminService {
         this.adminRepository = typedi_1.default.get(Admin_repository_1.AdminRepository);
     }
     async getZonesByAccessGroupIds(accessGroupIds) {
-        return await this.adminRepository.getZonesByAccessGroupIds(accessGroupIds);
+        try {
+            return await this.adminRepository.getZonesByAccessGroupIds(accessGroupIds);
+        }
+        catch (error) {
+            console.log(error);
+        }
     }
 }
 exports.AdminService = AdminService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "5.1.4",
+  "version": "5.1.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [