dt-common-device 8.0.1 → 8.0.2

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.d.ts

@@ -4,7 +4,7 @@ export declare function initialize(cfg: IConfig): Promise<void>;
 export declare function getConfig(): IConfig;
 export declare function getDeviceServiceUrl(): string;
 export declare function getAdminServiceUrl(): string;
-export declare function getDeviceProfileServiceUrl(): string;
+export declare function getMonitoringServiceUrl(): string;
 export declare function getSqsQueueUrl(): string;
 export declare function getReservationSqsQueueUrl(): string;
 export declare function getHeartbeatSqsQueueUrl(): string;

package/dist/config/config.js

@@ -7,7 +7,7 @@ exports.initialize = initialize;
 exports.getConfig = getConfig;
 exports.getDeviceServiceUrl = getDeviceServiceUrl;
 exports.getAdminServiceUrl = getAdminServiceUrl;
-exports.getDeviceProfileServiceUrl = getDeviceProfileServiceUrl;
+exports.getMonitoringServiceUrl = getMonitoringServiceUrl;
 exports.getSqsQueueUrl = getSqsQueueUrl;
 exports.getReservationSqsQueueUrl = getReservationSqsQueueUrl;
 exports.getHeartbeatSqsQueueUrl = getHeartbeatSqsQueueUrl;
@@ -142,16 +142,13 @@ function getAdminServiceUrl() {
     }
     throw new Error("dt-common-device: ADMIN_SERVICE is not configured for this service");
 }
-function getDeviceProfileServiceUrl() {
-    if (constants_1.CONFIG_KEYS[sourceKey].env.includes("MONITORING_SERVICE_PYTHON")) {
-        const deviceProfileServiceUrl = process.env.MONITORING_SERVICE_PYTHON;
-        if (!deviceProfileServiceUrl) {
-            getConfig().LOGGER.error("MONITORING_SERVICE_PYTHON must be set in environment variables");
-            throw new Error("dt-common-device: MONITORING_SERVICE_PYTHON must be set in environment variables");
-        }
-        return deviceProfileServiceUrl;
+function getMonitoringServiceUrl() {
+    const monitoringServiceUrl = process.env.MONITORING_SERVICE_PYTHON;
+    if (!monitoringServiceUrl) {
+        getConfig().LOGGER.error("MONITORING_SERVICE_PYTHON must be set in environment variables");
+        throw new Error("dt-common-device: MONITORING_SERVICE_PYTHON must be set in environment variables");
     }
-    throw new Error("dt-common-device: DEVICE_PROFILE_SERVICE is not configured for this service");
+    return monitoringServiceUrl;
 }
 function getSqsQueueUrl() {
     if (constants_1.CONFIG_KEYS[sourceKey].env.includes("AWS_SQS_URL")) {

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/device/local/services/Device.service.d.ts

@@ -6,7 +6,7 @@ export declare class LocalDeviceService {
     private readonly deviceRepository;
     private readonly issueService;
     private readonly localPropertyService;
-    private readonly deviceProfileRepository;
+    private readonly monitoringRepository;
     constructor();
     createDevice(body: IDevice): Promise<IDevice>;
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;

package/dist/entities/device/local/services/Device.service.js

@@ -83,7 +83,7 @@ const constants_1 = require("../../../../constants");
 const audit_1 = require("../../../../audit");
 const issue_types_1 = require("../../../../issues/issue.types");
 const property_1 = require("../../../property");
-const DeviceProfile_repository_1 = require("../repository/DeviceProfile.repository");
+const Monitoring_repository_1 = require("../../../monitoring/Monitoring.repository");
 let LocalDeviceService = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -96,7 +96,7 @@ let LocalDeviceService = (() => {
             this.deviceRepository = typedi_1.default.get(Device_repository_1.DeviceRepository);
             this.issueService = typedi_1.default.get(Issue_service_1.IssueService);
             this.localPropertyService = typedi_1.default.get(property_1.LocalPropertyService);
-            this.deviceProfileRepository = typedi_1.default.get(DeviceProfile_repository_1.DeviceProfileRepository);
+            this.monitoringRepository = typedi_1.default.get(Monitoring_repository_1.MonitoringRepository);
         }
         async createDevice(body) {
             const device = await this.deviceRepository.createDevice(body);
@@ -351,7 +351,7 @@ let LocalDeviceService = (() => {
             }
         }
         async getDeviceBaseline(deviceId) {
-            const response = await this.deviceProfileRepository.getDeviceBaseLine(deviceId);
+            const response = await this.monitoringRepository.getDeviceBaseLine(deviceId);
             const baselineInMilliseconds = response?.baseline && response?.baseline * 60 * 1000;
             return baselineInMilliseconds ?? 3600000; // 1 hour in milliseconds
         }

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/monitoring/Monitoring.repository.d.ts

@@ -0,0 +1,5 @@
+export declare class MonitoringRepository {
+    private readonly axiosInstance;
+    constructor();
+    getDeviceBaseLine(deviceId: string): Promise<any>;
+}

package/dist/{device/cloud/entities/DeviceFactory.js → entities/monitoring/Monitoring.repository.js}

@@ -37,44 +37,39 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
     if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeviceFactory = void 0;
-const Device_service_1 = require("../../local/services/Device.service");
-const typedi_1 = __importDefault(require("typedi"));
-const typedi_2 = require("typedi");
-let DeviceFactory = (() => {
-    let _classDecorators = [(0, typedi_2.Service)()];
+exports.MonitoringRepository = void 0;
+const typedi_1 = require("typedi");
+const utils_1 = require("../../utils");
+const config_1 = require("../../config/config");
+let MonitoringRepository = (() => {
+    let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
-    var DeviceFactory = _classThis = class {
+    var MonitoringRepository = _classThis = class {
         constructor() {
-            // Use dependency injection instead of creating new instance
-            this.localDeviceService = typedi_1.default.get(Device_service_1.LocalDeviceService);
+            this.axiosInstance = (0, utils_1.getMonitoringServiceAxiosInstance)();
         }
-        async getDevice(deviceId) {
+        async getDeviceBaseLine(deviceId) {
             try {
-                return await this.localDeviceService.getDevice(deviceId);
+                const response = await this.axiosInstance.get(`/baseline/${deviceId}`);
+                return response.data;
             }
             catch (error) {
-                // Log the error for debugging purposes
-                console.error(`DeviceFactory: Failed to get device ${deviceId}:`, error);
-                // Re-throw the error with additional context
-                throw new Error(`DeviceFactory: Unable to retrieve device ${deviceId}. ${error instanceof Error ? error.message : "Unknown error occurred"}`);
+                (0, config_1.getConfig)().LOGGER.error(`Failed to get device baseline for ${deviceId}:`, error);
+                throw new Error(`Failed to get device baseline: ${error.message || "Unknown error"}`);
             }
         }
     };
-    __setFunctionName(_classThis, "DeviceFactory");
+    __setFunctionName(_classThis, "MonitoringRepository");
     (() => {
         const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
         __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-        DeviceFactory = _classThis = _classDescriptor.value;
+        MonitoringRepository = _classThis = _classDescriptor.value;
         if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         __runInitializers(_classThis, _classExtraInitializers);
     })();
-    return DeviceFactory = _classThis;
+    return MonitoringRepository = _classThis;
 })();
-exports.DeviceFactory = DeviceFactory;
+exports.MonitoringRepository = MonitoringRepository;

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/utils/http.utils.d.ts

@@ -8,7 +8,7 @@ export declare function validateServiceUrl(url: string): boolean;
 export declare function createAxiosInstance(baseURL?: string): import("axios").AxiosInstance;
 export declare function getDeviceServiceAxiosInstance(): any;
 export declare function getAdminServiceAxiosInstance(): any;
-export declare function getDeviceProfileServiceAxiosInstance(): any;
+export declare function getMonitoringServiceAxiosInstance(): any;
 /**
  * Retry function for failed HTTP requests
  */

package/dist/utils/http.utils.js

@@ -7,7 +7,7 @@ exports.validateServiceUrl = validateServiceUrl;
 exports.createAxiosInstance = createAxiosInstance;
 exports.getDeviceServiceAxiosInstance = getDeviceServiceAxiosInstance;
 exports.getAdminServiceAxiosInstance = getAdminServiceAxiosInstance;
-exports.getDeviceProfileServiceAxiosInstance = getDeviceProfileServiceAxiosInstance;
+exports.getMonitoringServiceAxiosInstance = getMonitoringServiceAxiosInstance;
 exports.retryRequest = retryRequest;
 const config_1 = require("../config/config");
 const axios_1 = __importDefault(require("axios"));
@@ -98,12 +98,12 @@ function getAdminServiceAxiosInstance() {
     }
     return cloudServiceAxiosInstance;
 }
-let deviceProfileServiceAxiosInstance = null;
-function getDeviceProfileServiceAxiosInstance() {
-    if (!deviceProfileServiceAxiosInstance) {
-        deviceProfileServiceAxiosInstance = createAxiosInstance((0, config_1.getDeviceProfileServiceUrl)());
+let deviceMonitoringServiceAxiosInstance = null;
+function getMonitoringServiceAxiosInstance() {
+    if (!deviceMonitoringServiceAxiosInstance) {
+        deviceMonitoringServiceAxiosInstance = createAxiosInstance((0, config_1.getMonitoringServiceUrl)());
     }
-    return deviceProfileServiceAxiosInstance;
+    return deviceMonitoringServiceAxiosInstance;
 }
 /**
  * Retry function for failed HTTP requests

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "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[]>;
-}