dt-common-device 10.0.0 → 10.0.1

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

@@ -212,36 +212,38 @@ let AdminRepository = (() => {
             return collectionZoneDevices;
         }
         async getZonesByAccessGroups(accessGroupIds) {
-            // Fetch zones associated with these access groups
+            // Fetch zone IDs associated with these access groups
             const zonesIdsQuery = `
-      SELECT DISTINCT z."zoneId"
-      FROM dt_zones_collection_map z
-      WHERE z."collectionId" = ANY($1)
-    `;
+    SELECT DISTINCT z."zoneId"
+    FROM dt_zones_collection_map z
+    WHERE z."collectionId" = ANY($1)
+  `;
             const zonesIdsResult = await this.postgres.query(zonesIdsQuery, [
                 accessGroupIds,
             ]);
+            const zonesIds = zonesIdsResult.rows.map((row) => row.zoneId);
+            if (zonesIds.length === 0) {
+                return [];
+            }
+            // Fetch zone type IDs for guest rooms and rooms
             const zoneTypesQuery = `
-      SELECT id
-      FROM "dt_zoneTypes"
-      WHERE name = 'Guest Room'
-    `;
+    SELECT id
+    FROM "dt_zoneTypes"
+    WHERE name IN ('Guest Room', 'Room')
+  `;
             const zoneTypes = await this.postgres.query(zoneTypesQuery);
-            const guestRoomZoneTypeId = zoneTypes.rows[0].id;
-            const zonesIds = zonesIdsResult.rows.map((row) => row.zoneId);
+            const guestRoomZoneTypeIds = zoneTypes.rows.map((e) => e.id);
+            // Fetch zones matching both sets of IDs
             const zonesQuery = `
-      SELECT id
-      FROM dt_zones
-      WHERE id = ANY($1) AND "zoneTypeId" = $2
-    `;
+    SELECT id
+    FROM dt_zones
+    WHERE id = ANY($1) AND "zoneTypeId" = ANY($2)
+  `;
             const zonesResult = await this.postgres.query(zonesQuery, [
                 zonesIds,
-                guestRoomZoneTypeId,
+                guestRoomZoneTypeIds,
             ]);
-            if (zonesResult?.rows?.length > 0) {
-                return zonesResult?.rows?.map((e) => e.id);
-            }
-            return [];
+            return zonesResult.rows.map((e) => e.id);
         }
         async getAccessGroup(accessGroupId) {
             const query = `

package/package.json

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