dt-common-device 7.8.14 → 7.9.0

package/dist/audit/AuditUtils.js

@@ -78,6 +78,7 @@ const services_1 = require("../entities/device/local/services");
 const typedi_1 = __importStar(require("typedi"));
 const pms_1 = require("../entities/pms");
 const admin_1 = require("../entities/admin");
+const config_1 = require("../config/config");
 let AuditUtils = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -132,57 +133,74 @@ let AuditUtils = (() => {
             return audit;
         }
         async populateAuditFields(audit) {
-            const { propertyId, propertyName, userId, userName, guestId, guestName, deviceId, deviceName, zoneId, zoneName, accessGroupId, accessGroupName, scheduleId, } = audit;
-            if (propertyId && !propertyName) {
-                if (propertyId === "triggered_externally") {
-                    audit.propertyName = "Triggered Externally";
+            try {
+                const { propertyId, propertyName, userId, userName, guestId, guestName, deviceId, deviceName, zoneId, zoneName, accessGroupId, accessGroupName, scheduleId, } = audit;
+                if (propertyId && !propertyName) {
+                    (0, config_1.getLogger)().info(`Property ID: ${propertyId}`);
+                    if (propertyId === "triggered_externally") {
+                        audit.propertyName = "Triggered Externally";
+                    }
+                    else if (propertyId === "property_not_found") {
+                        (0, config_1.getLogger)().info(`Property ID: ${propertyId}`);
+                        audit.propertyName = "Property Not Found";
+                    }
+                    else {
+                        (0, config_1.getLogger)().info(`Property ID: ${propertyId}`);
+                        audit.propertyName = await this.getPropertyName(propertyId);
+                    }
                 }
-                else {
-                    audit.propertyName = await this.getPropertyName(propertyId);
+                if (!propertyId && deviceId) {
+                    audit.propertyId = await this.getFieldFromDevice(deviceId, "propertyId");
+                    audit.propertyName = await this.getPropertyName(audit.propertyId);
+                }
+                if (zoneId && !zoneName)
+                    audit.zoneName = await this.getZoneName(zoneId);
+                if (!zoneId && deviceId) {
+                    audit.zoneId = await this.getFieldFromDevice(deviceId, "zoneId");
+                    audit.zoneName = await this.getZoneName(audit.zoneId);
+                }
+                if (userId && !userName)
+                    audit.userName = await this.getUserName(userId);
+                if (guestId && !guestName)
+                    audit.guestName = await this.getGuestName(guestId);
+                if (deviceId && !deviceName) {
+                    audit.deviceName = await this.getDeviceName(deviceId);
+                }
+                if (accessGroupId && !accessGroupName)
+                    audit.accessGroupName = await this.getAccessGroupName(accessGroupId);
+                if (scheduleId) {
+                    const { scheduleStartDate, scheduleEndDate, scheduleDuration, scheduleSource, scheduleStatus, } = await this.getScheduleDetails(scheduleId);
+                    audit.scheduleStartDate = scheduleStartDate;
+                    audit.scheduleEndDate = scheduleEndDate;
+                    audit.scheduleDuration = scheduleDuration;
+                    audit.scheduleSource = scheduleSource;
+                    audit.scheduleStatus = scheduleStatus;
                 }
             }
-            if (!propertyId && deviceId) {
-                audit.propertyId = await this.getFieldFromDevice(deviceId, "propertyId");
-                audit.propertyName = await this.getPropertyName(audit.propertyId);
-            }
-            if (zoneId && !zoneName)
-                audit.zoneName = await this.getZoneName(zoneId);
-            if (!zoneId && deviceId) {
-                audit.zoneId = await this.getFieldFromDevice(deviceId, "zoneId");
-                audit.zoneName = await this.getZoneName(audit.zoneId);
-            }
-            if (userId && !userName)
-                audit.userName = await this.getUserName(userId);
-            if (guestId && !guestName)
-                audit.guestName = await this.getGuestName(guestId);
-            if (deviceId && !deviceName) {
-                audit.deviceName = await this.getDeviceName(deviceId);
-            }
-            if (accessGroupId && !accessGroupName)
-                audit.accessGroupName = await this.getAccessGroupName(accessGroupId);
-            if (scheduleId) {
-                const { scheduleStartDate, scheduleEndDate, scheduleDuration, scheduleSource, scheduleStatus, } = await this.getScheduleDetails(scheduleId);
-                audit.scheduleStartDate = scheduleStartDate;
-                audit.scheduleEndDate = scheduleEndDate;
-                audit.scheduleDuration = scheduleDuration;
-                audit.scheduleSource = scheduleSource;
-                audit.scheduleStatus = scheduleStatus;
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in populateAuditFields:", error);
             }
         }
         /**
          * Generic utility to get cached entity data from Redis using individual keys
          */
         async getCachedEntityData(entityType, entityId, fetchFunction) {
-            const cacheKey = `${this.CACHE_PREFIX}:${entityType}:${entityId}`;
-            // Try to get from cache first
-            const cachedData = await this.redisUtils.get(cacheKey);
-            if (cachedData) {
-                return JSON.parse(cachedData);
+            try {
+                const cacheKey = `${this.CACHE_PREFIX}:${entityType}:${entityId}`;
+                // Try to get from cache first
+                const cachedData = await this.redisUtils.get(cacheKey);
+                if (cachedData) {
+                    return JSON.parse(cachedData);
+                }
+                // If not in cache, fetch from database and cache it
+                const entityData = await fetchFunction();
+                await this.redisUtils.set(cacheKey, JSON.stringify(entityData), this.CACHE_TTL);
+                return entityData;
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getCachedEntityData:", error);
+                throw error;
             }
-            // If not in cache, fetch from database and cache it
-            const entityData = await fetchFunction();
-            await this.redisUtils.set(cacheKey, JSON.stringify(entityData), this.CACHE_TTL);
-            return entityData;
         }
         /**
          * Utility to calculate schedule duration in days
@@ -192,85 +210,139 @@ let AuditUtils = (() => {
             return Math.ceil(duration / (1000 * 60 * 60 * 24));
         }
         async getPropertyName(propertyId) {
-            return this.getCachedEntityData("property", propertyId, async () => {
-                const property = await typedi_1.default.get(property_1.LocalPropertyService).getProperty(propertyId);
-                return property?.name || "";
-            });
+            try {
+                return await this.getCachedEntityData("property", propertyId, async () => {
+                    const property = await typedi_1.default.get(property_1.LocalPropertyService).getProperty(propertyId);
+                    return property?.name || "property_not_found";
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getPropertyName:", error);
+                return "";
+            }
         }
         async getFieldFromDevice(deviceId, field) {
-            const redisKey = `device:${deviceId}`;
-            const redisDevice = await this.redisUtils.hget(redisKey, "device");
-            if (redisDevice) {
-                return redisDevice[field];
+            try {
+                const redisKey = `device:${deviceId}`;
+                const redisDevice = await this.redisUtils.hget(redisKey, "device");
+                if (redisDevice) {
+                    return redisDevice[field];
+                }
+                else {
+                    const device = await typedi_1.default.get(services_1.LocalDeviceService).getDevice(deviceId);
+                    await this.redisUtils.hset(redisKey, "device", JSON.stringify(device));
+                    await this.redisUtils.expire(redisKey, this.CACHE_TTL);
+                    return device[field];
+                }
             }
-            else {
-                const device = await typedi_1.default.get(services_1.LocalDeviceService).getDevice(deviceId);
-                await this.redisUtils.hset(redisKey, "device", JSON.stringify(device));
-                await this.redisUtils.expire(redisKey, this.CACHE_TTL);
-                return device[field];
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getFieldFromDevice:", error);
+                return "";
             }
         }
         async getUserName(userId) {
-            return this.getCachedEntityData("user", userId, async () => {
-                const user = await typedi_1.default.get(admin_1.AdminService).getUser(userId);
-                if (!user)
-                    return "";
-                return `${user?.firstName || ""} ${user?.lastName || ""}`.trim();
-            });
+            try {
+                return await this.getCachedEntityData("user", userId, async () => {
+                    const user = await typedi_1.default.get(admin_1.AdminService).getUser(userId);
+                    if (!user)
+                        return "user_not_found";
+                    return `${user?.firstName || ""} ${user?.lastName || ""}`.trim();
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getUserName:", error);
+                return "";
+            }
         }
         async getGuestName(guestId) {
-            return this.getCachedEntityData("guest", guestId, async () => {
-                const guest = await typedi_1.default.get(pms_1.PmsService).getGuest(guestId);
-                if (!guest)
-                    return "";
-                return `${guest?.firstName || ""} ${guest?.lastName || ""}`.trim();
-            });
+            try {
+                return await this.getCachedEntityData("guest", guestId, async () => {
+                    const guest = await typedi_1.default.get(pms_1.PmsService).getGuest(guestId);
+                    if (!guest)
+                        return "";
+                    return `${guest?.firstName || ""} ${guest?.lastName || ""}`.trim();
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getGuestName:", error);
+                return "";
+            }
         }
         async getDeviceName(deviceId) {
-            return this.getCachedEntityData("device", deviceId, async () => {
-                const device = await typedi_1.default.get(services_1.LocalDeviceService).querySelect({ deviceId }, ["name"]);
-                if (!device)
-                    return "";
-                return device[0]?.name || "";
-            });
+            try {
+                return await this.getCachedEntityData("device", deviceId, async () => {
+                    const device = await typedi_1.default.get(services_1.LocalDeviceService).querySelect({ deviceId }, ["name"]);
+                    if (!device)
+                        return "";
+                    return device[0]?.name || "";
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getDeviceName:", error);
+                return "";
+            }
         }
         async getZoneName(zoneId) {
-            return this.getCachedEntityData("zone", zoneId, async () => {
-                const zone = await typedi_1.default.get(admin_1.AdminService).getZone(zoneId);
-                if (!zone)
-                    return "";
-                return zone?.name || "";
-            });
+            try {
+                return await this.getCachedEntityData("zone", zoneId, async () => {
+                    const zone = await typedi_1.default.get(admin_1.AdminService).getZone(zoneId);
+                    if (!zone)
+                        return "";
+                    return zone?.name || "";
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getZoneName:", error);
+                return "";
+            }
         }
         async getAccessGroupName(accessGroupId) {
-            return this.getCachedEntityData("accessGroup", accessGroupId, async () => {
-                const accessGroup = await typedi_1.default.get(admin_1.AdminService).getAccessGroup(accessGroupId);
-                if (!accessGroup)
-                    return "";
-                return accessGroup?.name || "";
-            });
+            try {
+                return await this.getCachedEntityData("accessGroup", accessGroupId, async () => {
+                    const accessGroup = await typedi_1.default.get(admin_1.AdminService).getAccessGroup(accessGroupId);
+                    if (!accessGroup)
+                        return "";
+                    return accessGroup?.name || "";
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getAccessGroupName:", error);
+                return "";
+            }
         }
         async getScheduleDetails(scheduleId) {
-            return this.getCachedEntityData("schedule", scheduleId, async () => {
-                const schedule = await typedi_1.default.get(pms_1.PmsService).getSchedule(scheduleId);
-                if (!schedule) {
+            try {
+                return await this.getCachedEntityData("schedule", scheduleId, async () => {
+                    const schedule = await typedi_1.default.get(pms_1.PmsService).getSchedule(scheduleId);
+                    if (!schedule) {
+                        return {
+                            scheduleStartDate: "",
+                            scheduleEndDate: "",
+                            scheduleDuration: 0,
+                            scheduleSource: "",
+                            scheduleStatus: "",
+                        };
+                    }
+                    const scheduleDuration = this.calculateScheduleDuration(schedule.startTime, schedule.endTime);
                     return {
-                        scheduleStartDate: "",
-                        scheduleEndDate: "",
-                        scheduleDuration: 0,
-                        scheduleSource: "",
-                        scheduleStatus: "",
+                        scheduleStartDate: schedule.startTime,
+                        scheduleEndDate: schedule.endTime,
+                        scheduleDuration,
+                        scheduleSource: schedule.source,
+                        scheduleStatus: schedule.status,
                     };
-                }
-                const scheduleDuration = this.calculateScheduleDuration(schedule.startTime, schedule.endTime);
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error("Error in getScheduleDetails:", error);
                 return {
-                    scheduleStartDate: schedule.startTime,
-                    scheduleEndDate: schedule.endTime,
-                    scheduleDuration,
-                    scheduleSource: schedule.source,
-                    scheduleStatus: schedule.status,
+                    scheduleStartDate: "",
+                    scheduleEndDate: "",
+                    scheduleDuration: 0,
+                    scheduleSource: "",
+                    scheduleStatus: "",
                 };
-            });
+            }
         }
     };
     __setFunctionName(_classThis, "AuditUtils");

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

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

package/dist/{device/cloud/entities/DeviceFactory.js → entities/device/local/repository/DeviceProfile.repository.js}

@@ -37,44 +37,29 @@ 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.DeviceProfileRepository = void 0;
+const typedi_1 = require("typedi");
+const utils_1 = require("../../../../utils");
+let DeviceProfileRepository = (() => {
+    let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
-    var DeviceFactory = _classThis = class {
+    var DeviceProfileRepository = _classThis = class {
         constructor() {
-            // Use dependency injection instead of creating new instance
-            this.localDeviceService = typedi_1.default.get(Device_service_1.LocalDeviceService);
-        }
-        async getDevice(deviceId) {
-            try {
-                return await this.localDeviceService.getDevice(deviceId);
-            }
-            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"}`);
-            }
+            this.axiosInstance = (0, utils_1.getDeviceServiceAxiosInstance)();
         }
+        async getDeviceBaseLine(deviceId) { }
     };
-    __setFunctionName(_classThis, "DeviceFactory");
+    __setFunctionName(_classThis, "DeviceProfileRepository");
     (() => {
         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;
+        DeviceProfileRepository = _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 DeviceProfileRepository = _classThis;
 })();
-exports.DeviceFactory = DeviceFactory;
+exports.DeviceProfileRepository = DeviceProfileRepository;

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

@@ -137,7 +137,7 @@ let LocalDeviceService = (() => {
                     await this.handleOnlineStatus(device, device.status, body.status, auditBody?.source || Service_1.Source.SYSTEM, auditBody);
                 }
                 else {
-                    await this.handleOfflineStatus(device, device.status, body.status, auditBody?.source || Service_1.Source.SYSTEM, auditBody);
+                    await this.handleOfflineStatus(device, device.status, body.status, auditBody?.source || Service_1.Source.SYSTEM, auditBody, body.status.error?.message);
                 }
                 if (body.state?.batteryPercentage?.value) {
                     await this.setBatteryLevel(deviceId, body.state?.batteryPercentage?.value, auditBody?.source || Service_1.Source.SYSTEM, auditBody);
@@ -278,8 +278,8 @@ let LocalDeviceService = (() => {
             await this.eventHandler.onStatusChangeMany(query, newStatus, auditBody, eventType);
         }
         async handleOfflineStatus(device, oldStatus, newStatus, source, auditBody, reason, currentTime) {
-            const isExistingStatusOnline = oldStatus?.online === true;
-            const isExistingStatusOffline = oldStatus?.online === false;
+            const isExistingStatusOnline = oldStatus?.liveStatus === "ONLINE";
+            const isExistingStatusOffline = oldStatus?.liveStatus === "OFFLINE";
             if (isExistingStatusOnline) {
                 // Existing status is Online
                 newStatus.online = true;

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/package.json

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