dt-common-device 5.1.2 → 5.1.4

package/dist/audit/AuditUtils.js

@@ -210,36 +210,55 @@ let AuditUtils = (() => {
         async getUserName(userId) {
             return this.getCachedEntityData("user", userId, async () => {
                 const user = await typedi_1.default.get(User_service_1.UserService).getUser(userId);
+                if (!user)
+                    return "";
                 return `${user?.firstName || ""} ${user?.lastName || ""}`.trim();
             });
         }
         async getGuestName(guestId) {
             return this.getCachedEntityData("guest", guestId, async () => {
                 const guest = await typedi_1.default.get(guest_1.GuestService).getGuest(guestId);
+                if (!guest)
+                    return "";
                 return `${guest?.firstName || ""} ${guest?.lastName || ""}`.trim();
             });
         }
         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 || "";
             });
         }
         async getZoneName(zoneId) {
             return this.getCachedEntityData("zone", zoneId, async () => {
                 const zone = await typedi_1.default.get(zone_1.ZoneService).getZone(zoneId);
+                if (!zone)
+                    return "";
                 return zone?.name || "";
             });
         }
         async getAccessGroupName(accessGroupId) {
             return this.getCachedEntityData("accessGroup", accessGroupId, async () => {
                 const accessGroup = await typedi_1.default.get(accessGroup_1.AccessGroupService).getAccessGroup(accessGroupId);
+                if (!accessGroup)
+                    return "";
                 return accessGroup?.name || "";
             });
         }
         async getScheduleDetails(scheduleId) {
             return this.getCachedEntityData("schedule", scheduleId, async () => {
                 const schedule = await typedi_1.default.get(schedules_1.ScheduleService).getSchedule(scheduleId);
+                if (!schedule) {
+                    return {
+                        scheduleStartDate: "",
+                        scheduleEndDate: "",
+                        scheduleDuration: 0,
+                        scheduleSource: "",
+                        scheduleStatus: "",
+                    };
+                }
                 const scheduleDuration = this.calculateScheduleDuration(schedule.startTime, schedule.endTime);
                 return {
                     scheduleStartDate: schedule.startTime,

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.js

@@ -114,7 +114,7 @@ let AdminRepository = (() => {
             const collectionZone = [];
             for (let i = 0; i < response.length; i++) {
                 let zoneIds = [];
-                const zones = await this.axiosInstance.get(`/zones/child?zoneId=${response[i].zoneId}`);
+                const zones = await this.axiosInstance.get(`/zones/child?zoneId=${response[i].zoneId}`).data.data;
                 zoneIds.push(response[i].zoneId);
                 if (zones.childZones?.length > 0) {
                     const nestedZoneIds = new Set(_zones(zones.childZones));

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

@@ -53,7 +53,10 @@ let GuestRepository = (() => {
         async getGuest(guestId) {
             try {
                 const guest = await this.pmsPostgres.query(`SELECT * FROM dt_guest WHERE "id" = $1`, [guestId]);
-                return guest.rows[0];
+                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

@@ -53,7 +53,10 @@ let ScheduleRepository = (() => {
         async getSchedule(scheduleId) {
             try {
                 const schedule = await this.pmsPostgres.query(`SELECT * FROM dt_schedule WHERE "id" = $1`, [scheduleId]);
-                return schedule.rows[0];
+                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": "5.1.2",
+  "version": "5.1.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [