dt-common-device 12.0.0 → 12.0.1

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

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

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

@@ -78,7 +78,6 @@ 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;
@@ -89,9 +88,25 @@ 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, propertyId) {
+        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);
+            // }
             // If not cached, get the result from the database
             const result = await this.postgres.query(`SELECT 
         "zc"."id" AS "zoneCollectionMapId",
@@ -125,18 +140,7 @@ let AdminRepository = (() => {
             const collectionZone = [];
             for (let zone of response) {
                 let zoneIds = [];
-                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);
-                }
+                const zones = (await (0, utils_1.getAdminServiceAxiosInstance)().get(`/zones/child?zoneId=${zone.zoneId}`))?.data?.data;
                 zoneIds.push(zone.zoneId);
                 if (zones.childZones?.length > 0) {
                     const nestedZoneIds = new Set(_zones(zones.childZones));

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

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

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, propertyId) {
+        async getZonesByAccessGroupIds(accessGroupIds) {
             try {
-                return await this.adminRepository.getZonesByAccessGroupIds(accessGroupIds, propertyId);
+                return await this.adminRepository.getZonesByAccessGroupIds(accessGroupIds);
             }
             catch (error) {
                 console.log(error);

package/dist/entities/connection/Connection.repository.d.ts

@@ -4,5 +4,6 @@ export declare class ConnectionRepository {
     constructor();
     createConnection(data: Partial<IConnection>): Promise<IConnection>;
     getConnectionById(connectionId: string): Promise<IConnection>;
+    queryConnections(query: Partial<IConnection>): Promise<IConnection[]>;
     updateConnection(connectionId: string, data: Partial<IConnection>): Promise<any>;
 }

package/dist/entities/connection/Connection.repository.js

@@ -69,6 +69,28 @@ let ConnectionRepository = (() => {
             const result = await this.pool.query("SELECT * FROM dt_connections WHERE id = $1", [connectionId]);
             return result.rows[0];
         }
+        async queryConnections(query) {
+            // Filter out undefined/null values and build WHERE clause
+            const conditions = [];
+            const values = [];
+            let paramIndex = 1;
+            // Build conditions dynamically based on provided query parameters
+            Object.keys(query).forEach((key) => {
+                const value = query[key];
+                if (value !== undefined && value !== null) {
+                    conditions.push(`"${key}" = $${paramIndex}`);
+                    values.push(value);
+                    paramIndex++;
+                }
+            });
+            // Build the SQL query
+            let sql = "SELECT * FROM dt_connections";
+            if (conditions.length > 0) {
+                sql += ` WHERE ${conditions.join(" AND ")}`;
+            }
+            const result = await this.pool.query(sql, values);
+            return result.rows;
+        }
         async updateConnection(connectionId, data) {
             // Build dynamic SET clause with quoted column names
             const setClause = Object.keys(data)

package/dist/entities/connection/Connection.service.d.ts

@@ -4,5 +4,6 @@ export declare class LocalConnectionService {
     constructor();
     createConnection(data: Partial<IConnection>): Promise<IConnection>;
     getConnection(connectionId: string): Promise<IConnection>;
+    queryConnections(query: Partial<IConnection>): Promise<IConnection[]>;
     updateConnection(connectionId: string, data: Partial<IConnection>): Promise<IConnection>;
 }

package/dist/entities/connection/Connection.service.js

@@ -22,6 +22,9 @@ class LocalConnectionService {
         }
         return await this.connectionRepository.getConnectionById(connectionId);
     }
+    async queryConnections(query) {
+        return await this.connectionRepository.queryConnections(query);
+    }
     async updateConnection(connectionId, data) {
         if (!connectionId) {
             throw new Error("Connection ID is required");

package/dist/issues/Issue.service.js

@@ -239,7 +239,7 @@ let IssueService = (() => {
                 title: device.deviceType.type.toLowerCase() === "hub"
                     ? "Hub Offline"
                     : "Device Offline",
-                description: `${device.name} has gone offline. ${reason ? `Reason: ${reason}.` : ""}`,
+                description: `${device.name} has gone offline ${reason ? `Reason: ${reason}` : ""}.`,
                 createdBy: source,
                 category: issue_types_1.IssuesCategory.OPERATIONS,
                 priority: issue_types_1.IssuePriority.CRITICAL,

package/package.json

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