dt-common-device 11.2.2 → 11.2.3

package/dist/chronicle/Cronicle.service.d.ts

@@ -1,9 +1,13 @@
 import { ICronicle } from "./ICronicle.interface";
 export declare class CronicleService {
-    private cronicleEndpoint;
-    private cronicleApiKey;
+    private readonly cronicleEndpoint;
+    private readonly cronicleApiKey;
     constructor();
     registerJob(payload: ICronicle): Promise<void>;
     getJob(jobId: string): Promise<any>;
+    getSchedules(filter: {
+        offset: number;
+        limit: number;
+    }): Promise<any>;
     deleteJob(jobId: string): Promise<void>;
 }

package/dist/chronicle/Cronicle.service.js

@@ -12,12 +12,12 @@ class CronicleService {
         this.cronicleApiKey = process.env.CRONICLE_API_KEY || "";
     }
     async registerJob(payload) {
-        const { name, apiUrl, method, schedule, cronJobId, target } = payload;
+        const { name, apiUrl, method, schedule, cronJobId, target, category } = payload;
         try {
             await axios_1.default.post(`${this.cronicleEndpoint}/create_event/v1`, {
                 id: cronJobId,
                 title: name,
-                category: "general",
+                category: category ?? "general",
                 plugin: "urlplug",
                 timeZone: "UTC",
                 enabled: 1,
@@ -48,6 +48,8 @@ class CronicleService {
     }
     async getJob(jobId) {
         try {
+            (0, config_1.getConfig)().LOGGER.info(`Getting job: ${jobId}`);
+            (0, config_1.getConfig)().LOGGER.info(`Cronicle endpoint: ${this.cronicleEndpoint}/get_event/v1`);
             const res = await axios_1.default.post(`${this.cronicleEndpoint}/get_event/v1`, {
                 id: jobId,
                 api_key: this.cronicleApiKey,
@@ -55,6 +57,21 @@ class CronicleService {
             return res.data;
         }
         catch (error) {
+            (0, config_1.getConfig)().LOGGER.error(`Failed to get job: ${error.message}`);
+            return;
+        }
+    }
+    async getSchedules(filter) {
+        try {
+            const res = await axios_1.default.post(`${this.cronicleEndpoint}/get_schedule/v1`, {
+                api_key: this.cronicleApiKey,
+                offset: filter.offset ?? 0,
+                limit: filter.limit ?? 100,
+            });
+            return res.data;
+        }
+        catch (error) {
+            (0, config_1.getConfig)().LOGGER.error(`Failed to get schedules: ${error.message}`);
             return;
         }
     }

package/dist/chronicle/ICronicle.interface.d.ts

@@ -1,6 +1,7 @@
 export interface ICronicle {
     name: string;
     cronJobId: string;
+    category?: "heartbeat" | "replenish_codes" | "sync_reservations" | "delete_reservations" | "deliver_codes" | "daily_summary" | "battery_report";
     apiUrl: string;
     method: "POST";
     target: string;

package/dist/config/config.js

@@ -69,11 +69,6 @@ async function initialize(cfg) {
         db_keys = constants_1.CONFIG_KEYS.MIGRATION.db_keys;
         await validateServiceConfig(cfg);
     }
-    if (cfg.SOURCE === "OPERATION_NODE_SERVICE") {
-        sourceKey = "OPERATION_NODE";
-        db_keys = constants_1.CONFIG_KEYS.OPERATION_NODE.db_keys;
-        await validateServiceConfig(cfg);
-    }
     // Connect to databases
     try {
         await (0, db_1.connectDatabase)();

package/dist/config/config.types.d.ts

@@ -4,7 +4,7 @@ export interface ILogger {
     warn(message: string, ...args: any[]): void;
     error(message: string, ...args: any[]): void;
 }
-type AllowedSource = "ACCESS_SERVICE" | "ADMIN_SERVICE" | "ENERGY_SERVICE" | "REMOTE_SERVICE" | "SCHEDULE_SERVICE" | "MIGRATION" | "OPERATION_NODE_SERVICE";
+type AllowedSource = "ACCESS_SERVICE" | "ADMIN_SERVICE" | "ENERGY_SERVICE" | "REMOTE_SERVICE" | "SCHEDULE_SERVICE" | "MIGRATION";
 export type IConfig = {
     SOURCE: AllowedSource;
     INTERNAL_EVENT_HANDLER?: IInternalEvent;

package/dist/config/constants.d.ts

@@ -56,11 +56,4 @@ export declare const CONFIG_KEYS: {
             pms: string;
         };
     };
-    OPERATION_NODE: {
-        env: string[];
-        INTERNAL_EVENT_HANDLER: boolean;
-        db_keys: {
-            pms: string;
-        };
-    };
 };

package/dist/config/constants.js

@@ -9,6 +9,8 @@ exports.REQUIRED = {
         "EVENT_BUS_NAME",
         "REDIS_HOST",
         "REDIS_PORT",
+        "POSTHOG_API_KEY",
+        "POSTHOG_HOST",
         "DEVICE_SERVICE",
         "DT_API_KEY",
         "MONITORING_SERVICE_PYTHON",
@@ -99,11 +101,4 @@ exports.CONFIG_KEYS = {
             pms: "PMS_DB_URI",
         },
     },
-    OPERATION_NODE: {
-        env: ["PMS_DB_URI"],
-        INTERNAL_EVENT_HANDLER: false,
-        db_keys: {
-            pms: "PMS_DB_URI",
-        },
-    },
 };

package/dist/constants/ConnectionProviders.d.ts

@@ -18,5 +18,4 @@ export declare const CONNECTION_PROVIDERS: {
     readonly DORMAKABA: "Dormakaba";
     readonly DUSAW: "Dusaw";
     readonly LOCKLY: "Lockly";
-    readonly CHECKFRONT: "Checkfront";
 };

package/dist/constants/ConnectionProviders.js

@@ -24,5 +24,4 @@ exports.CONNECTION_PROVIDERS = {
     DORMAKABA: "Dormakaba",
     DUSAW: "Dusaw",
     LOCKLY: "Lockly",
-    CHECKFRONT: "Checkfront",
 };

package/dist/entities/accessGroup/AccessGroup.repository.d.ts

@@ -1,5 +1,6 @@
+import { IAccessGroup } from "./IAccessGroup";
 export declare class AccessGroupRepository {
     private readonly postgres;
     constructor();
-    getAccessGroup(accessGroupId: string): Promise<any>;
+    getAccessGroup(accessGroupId: string): Promise<IAccessGroup | null>;
 }

package/dist/entities/accessGroup/AccessGroup.repository.js

@@ -56,7 +56,10 @@ let AccessGroupRepository = (() => {
       WHERE "id" = $1
     `;
             const result = await this.postgres.query(query, [accessGroupId]);
-            return result.rows[0];
+            if (result.rows.length > 0) {
+                return result.rows[0];
+            }
+            return null;
         }
     };
     __setFunctionName(_classThis, "AccessGroupRepository");

package/dist/entities/accessGroup/AccessGroup.service.d.ts

@@ -1,5 +1,6 @@
+import { IAccessGroup } from "./IAccessGroup";
 export declare class AccessGroupService {
     private readonly accessGroupRepository;
     constructor();
-    getAccessGroup(accessGroupId: string): Promise<any>;
+    getAccessGroup(accessGroupId: string): Promise<IAccessGroup | null>;
 }

package/dist/entities/accessGroup/AccessGroup.service.js

@@ -87,7 +87,10 @@ let AccessGroupService = (() => {
             if (!accessGroupId) {
                 throw new Error("Access Group ID is required");
             }
-            return await this.accessGroupRepository.getAccessGroup(accessGroupId);
+            const accessGroup = await this.accessGroupRepository.getAccessGroup(accessGroupId);
+            if (!accessGroup)
+                return null;
+            return accessGroup;
         }
     };
     __setFunctionName(_classThis, "AccessGroupService");
@@ -101,5 +104,3 @@ let AccessGroupService = (() => {
     return AccessGroupService = _classThis;
 })();
 exports.AccessGroupService = AccessGroupService;
-// Accessgroup.getAccessGroup(accessGroupId)
-// GetAccessGroup()

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/entities/guest/Guest.repository.d.ts

@@ -2,5 +2,5 @@ import { IGuest } from "./IGuest";
 export declare class GuestRepository {
     private readonly pmsPostgres;
     constructor();
-    getGuest(guestId: string): Promise<IGuest>;
+    getGuest(guestId: string): Promise<IGuest | null>;
 }

package/dist/entities/guest/Guest.repository.js

@@ -52,8 +52,11 @@ let GuestRepository = (() => {
         }
         async getGuest(guestId) {
             try {
-                const guest = await this.pmsPostgres.query(`SELECT * FROM dt_guests WHERE "id" = $1`, [guestId]);
-                return guest.rows[0];
+                const guest = await this.pmsPostgres.query(`SELECT * FROM dt_guest WHERE "id" = $1`, [guestId]);
+                if (guest.rows.length > 0) {
+                    return guest.rows[0];
+                }
+                return null;
             }
             catch (error) {
                 console.error("Error in getGuest:", error);

package/dist/entities/guest/Guest.service.d.ts

@@ -2,5 +2,5 @@ import { IGuest } from "./IGuest";
 export declare class GuestService {
     private readonly guestRepository;
     constructor();
-    getGuest(guestId: string): Promise<IGuest>;
+    getGuest(guestId: string): Promise<IGuest | null>;
 }

package/dist/entities/guest/Guest.service.js

@@ -88,7 +88,10 @@ let GuestService = (() => {
             if (!guestId) {
                 throw new Error("Guest ID is required");
             }
-            return await this.guestRepository.getGuest(guestId);
+            const guest = await this.guestRepository.getGuest(guestId);
+            if (!guest)
+                return null;
+            return guest;
         }
     };
     __setFunctionName(_classThis, "GuestService");

package/dist/entities/schedules/Schedule.repository.d.ts

@@ -2,5 +2,5 @@ import { ISchedule } from "./ISchedule";
 export declare class ScheduleRepository {
     private readonly pmsPostgres;
     constructor();
-    getSchedule(scheduleId: string): Promise<ISchedule>;
+    getSchedule(scheduleId: string): Promise<ISchedule | null>;
 }

package/dist/entities/schedules/Schedule.repository.js

@@ -52,8 +52,11 @@ let ScheduleRepository = (() => {
         }
         async getSchedule(scheduleId) {
             try {
-                const schedule = await this.pmsPostgres.query(`SELECT * FROM dt_schedules WHERE "id" = $1`, [scheduleId]);
-                return schedule.rows[0];
+                const schedule = await this.pmsPostgres.query(`SELECT * FROM dt_schedule WHERE "id" = $1`, [scheduleId]);
+                if (schedule.rows.length > 0) {
+                    return schedule.rows[0];
+                }
+                return null;
             }
             catch (error) {
                 console.error("Error in getSchedule:", error);

package/dist/entities/schedules/Schedule.service.d.ts

@@ -2,5 +2,5 @@ import { ISchedule } from "./ISchedule";
 export declare class ScheduleService {
     private readonly scheduleRepository;
     constructor();
-    getSchedule(scheduleId: string): Promise<ISchedule>;
+    getSchedule(scheduleId: string): Promise<ISchedule | null>;
 }

package/dist/entities/schedules/Schedule.service.js

@@ -88,7 +88,10 @@ let ScheduleService = (() => {
             if (!scheduleId) {
                 throw new Error("Schedule ID is required");
             }
-            return await this.scheduleRepository.getSchedule(scheduleId);
+            const schedule = await this.scheduleRepository.getSchedule(scheduleId);
+            if (!schedule)
+                return null;
+            return schedule;
         }
     };
     __setFunctionName(_classThis, "ScheduleService");

package/dist/entities/user/User.repository.js

@@ -52,7 +52,10 @@ let UserRepository = (() => {
         }
         async getUser(userId) {
             const user = await this.postgres.query(`SELECT * FROM dt_users WHERE "id" = $1`, [userId]);
-            return user.rows[0];
+            if (user.rows.length > 0) {
+                return user.rows[0];
+            }
+            return null;
         }
     };
     __setFunctionName(_classThis, "UserRepository");

package/dist/entities/user/User.service.d.ts

@@ -2,5 +2,5 @@ import { IUser } from "./IUser";
 export declare class UserService {
     private readonly userRepository;
     constructor();
-    getUser(userId: string): Promise<IUser>;
+    getUser(userId: string): Promise<IUser | null>;
 }

package/dist/entities/user/User.service.js

@@ -87,7 +87,10 @@ let UserService = (() => {
             if (!userId) {
                 throw new Error("User ID is required");
             }
-            return await this.userRepository.getUser(userId);
+            const user = await this.userRepository.getUser(userId);
+            if (!user)
+                return null;
+            return user;
         }
     };
     __setFunctionName(_classThis, "UserService");

package/dist/entities/zone/Zone.service.js

@@ -88,7 +88,10 @@ let ZoneService = (() => {
             if (!zoneId) {
                 throw new Error("Zone ID is required");
             }
-            return await this.zoneRepository.getZone(zoneId);
+            const zone = await this.zoneRepository.getZone(zoneId);
+            if (!zone)
+                return null;
+            return zone;
         }
     };
     __setFunctionName(_classThis, "ZoneService");

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/dist/queue/utils/rateLimit.utils.js

@@ -123,12 +123,6 @@ class RateLimitUtils {
             provider: constants_1.CONNECTION_PROVIDERS.WEBREZPRO,
             maxTimeoutWindowMs: 120000,
         });
-        configs.set(constants_1.CONNECTION_PROVIDERS.CHECKFRONT, {
-            maxRequests: 10,
-            windowMs: 60000,
-            provider: constants_1.CONNECTION_PROVIDERS.CHECKFRONT,
-            maxTimeoutWindowMs: 120000,
-        });
         return configs;
     }
     static async isRateLimitAllowed(connectionId, provider, rateLimitConfigs) {

package/package.json

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

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

@@ -1,7 +0,0 @@
-export declare class AdminRepository {
-    private readonly axiosInstance;
-    private readonly deviceRepository;
-    private readonly postgres;
-    constructor();
-    getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[]>;
-}