dt-common-device 11.1.9 → 11.2.0

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

@@ -3,10 +3,11 @@ export declare class AdminRepository {
     private readonly deviceRepository;
     private readonly postgres;
     private readonly localDeviceService;
+    private readonly redisUtils;
     constructor();
-    getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[]>;
+    getZonesByAccessGroupIds(accessGroupIds: string[], propertyId: string): Promise<any[]>;
     getZonesByAccessGroups(accessGroupIds: string[]): Promise<any[]>;
-    getAccessGroup(accessGroupId: string): Promise<IAccessGroup | null>;
+    getAccessGroup(accessGroupId: string, propertyId?: string): Promise<IAccessGroup | null>;
     getZoneAccessGroupByZoneId(zoneId: string): Promise<IZoneAccessGroup[] | null>;
     getZone(zoneId: string, propertyId?: string): Promise<IZone | null>;
     getUser(userId: string): Promise<IUser | null>;

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

@@ -78,6 +78,7 @@ const Device_repository_1 = require("../device/local/repository/Device.repositor
 const db_1 = require("../../db/db");
 const interfaces_1 = require("../device/cloud/interfaces");
 const services_1 = require("../device/local/services");
+const config_1 = require("../../config/config");
 let AdminRepository = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -88,25 +89,9 @@ let AdminRepository = (() => {
             this.deviceRepository = typedi_1.default.get(Device_repository_1.DeviceRepository);
             this.postgres = (0, db_1.getPostgresClient)();
             this.localDeviceService = typedi_1.default.get(services_1.LocalDeviceService);
+            this.redisUtils = typedi_1.default.get(utils_1.RedisUtils);
         }
-        async getZonesByAccessGroupIds(accessGroupIds) {
-            // // Get propertyId from any of the accessGroupIds
-            // const accessGroupIdsResult = await this.postgres.query(
-            //   `SELECT "propertyId" FROM dt_collections WHERE "id" = ANY($1) LIMIT 1`,
-            //   [accessGroupIds]
-            // );
-            // const propertyId = accessGroupIdsResult.rows[0].propertyId;
-            // const sortedAccessGroupIds = [...accessGroupIds].sort((a, b) =>
-            //   a.localeCompare(b)
-            // );
-            // // Check if the result is already cached
-            // const redisKey = `${propertyId}:zonesAndDevicesByAccessGroupIds:${sortedAccessGroupIds.join(
-            //   ","
-            // )}`;
-            // const cachedResult = await this.redisUtils.get(redisKey);
-            // if (cachedResult) {
-            //   return JSON.parse(cachedResult);
-            // }
+        async getZonesByAccessGroupIds(accessGroupIds, propertyId) {
             // If not cached, get the result from the database
             const result = await this.postgres.query(`SELECT 
         "zc"."id" AS "zoneCollectionMapId",
@@ -140,7 +125,18 @@ let AdminRepository = (() => {
             const collectionZone = [];
             for (let zone of response) {
                 let zoneIds = [];
-                const zones = (await (0, utils_1.getAdminServiceAxiosInstance)().get(`/zones/child?zoneId=${zone.zoneId}`))?.data?.data;
+                let zones = null;
+                const redisKey = `${propertyId}:childZones:${zone.zoneId}`;
+                const zonesCache = await this.redisUtils.get(redisKey);
+                if (zonesCache !== null && zonesCache !== undefined) {
+                    (0, config_1.getLogger)().info(`Got child zones from redis`);
+                    zones = JSON.parse(zonesCache);
+                }
+                else {
+                    const response = await (0, utils_1.getAdminServiceAxiosInstance)().get(`/zones/child?zoneId=${zone.zoneId}`);
+                    zones = response?.data?.data;
+                    await this.redisUtils.set(redisKey, JSON.stringify(zones), 86400);
+                }
                 zoneIds.push(zone.zoneId);
                 if (zones.childZones?.length > 0) {
                     const nestedZoneIds = new Set(_zones(zones.childZones));
@@ -245,11 +241,20 @@ let AdminRepository = (() => {
             ]);
             return zonesResult.rows.map((e) => e.id);
         }
-        async getAccessGroup(accessGroupId) {
-            const query = `
+        async getAccessGroup(accessGroupId, propertyId) {
+            let query;
+            if (propertyId) {
+                query = `
+      SELECT * FROM dt_collections
+      WHERE "id" = $1 AND "propertyId" = $2
+      `;
+            }
+            else {
+                query = `
       SELECT * FROM dt_collections
       WHERE "id" = $1
-    `;
+      `;
+            }
             const result = await this.postgres.query(query, [accessGroupId]);
             if (result.rows.length > 0) {
                 return result.rows[0];

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

@@ -3,9 +3,9 @@ export declare class AdminService {
     private readonly adminRepository;
     private readonly redisUtils;
     constructor();
-    getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[] | undefined>;
+    getZonesByAccessGroupIds(accessGroupIds: string[], propertyId: string): Promise<any[] | undefined>;
     getZonesByAccessGroups(accessGroupIds: string[]): Promise<any[] | undefined>;
-    getAccessGroup(accessGroupId: string): Promise<IAccessGroup | null>;
+    getAccessGroup(accessGroupId: string, propertyId?: string): Promise<IAccessGroup | null>;
     getAccessGroupByZoneId(zoneId: string): Promise<IAccessGroup[] | []>;
     getZone(zoneId: string, propertyId?: string): Promise<IZone | null>;
     getUser(userId: string): Promise<IUser | null>;

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

@@ -85,9 +85,9 @@ let AdminService = (() => {
             this.adminRepository = typedi_1.default.get(Admin_repository_1.AdminRepository);
             this.redisUtils = typedi_1.default.get(redis_utils_1.RedisUtils);
         }
-        async getZonesByAccessGroupIds(accessGroupIds) {
+        async getZonesByAccessGroupIds(accessGroupIds, propertyId) {
             try {
-                return await this.adminRepository.getZonesByAccessGroupIds(accessGroupIds);
+                return await this.adminRepository.getZonesByAccessGroupIds(accessGroupIds, propertyId);
             }
             catch (error) {
                 console.log(error);
@@ -101,13 +101,20 @@ let AdminService = (() => {
                 console.log(error);
             }
         }
-        async getAccessGroup(accessGroupId) {
+        async getAccessGroup(accessGroupId, propertyId) {
             if (!accessGroupId) {
                 throw new Error("Access Group ID is required");
             }
-            const accessGroup = await this.adminRepository.getAccessGroup(accessGroupId);
+            let accessGroup;
+            const redisKey = `collection:${accessGroupId}`;
+            accessGroup = await this.redisUtils.hget(redisKey, accessGroupId);
+            if (accessGroup)
+                return accessGroup;
+            accessGroup = await this.adminRepository.getAccessGroup(accessGroupId, propertyId);
             if (!accessGroup)
                 return null;
+            await this.redisUtils.hsetWithTTL(redisKey, accessGroup?.id, JSON.stringify(accessGroup), 86400);
+            await this.redisUtils.sadd(`property_collections:${accessGroup?.propertyId}`, accessGroup?.id);
             return accessGroup;
         }
         async getAccessGroupByZoneId(zoneId) {

package/package.json

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