dt-common-device 11.1.9 → 11.1.10

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

@@ -6,7 +6,7 @@ export declare class AdminRepository {
     constructor();
     getZonesByAccessGroupIds(accessGroupIds: 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

@@ -245,11 +245,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

@@ -5,7 +5,7 @@ export declare class AdminService {
     constructor();
     getZonesByAccessGroupIds(accessGroupIds: 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

@@ -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.1.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [