dt-common-device 11.0.5 → 11.1.1

package/dist/audit/AuditUtils.d.ts

@@ -18,8 +18,11 @@ export declare class AuditUtils {
     private getPropertyName;
     private getFieldFromDevice;
     private getUserName;
+    private getGuestName;
     private getDeviceName;
     private getZoneName;
     private getAccessGroupName;
+    private getScheduleId;
+    private getReferenceId;
     private getScheduleDetails;
 }

package/dist/audit/AuditUtils.js

@@ -134,7 +134,7 @@ let AuditUtils = (() => {
         }
         async populateAuditFields(audit) {
             try {
-                const { propertyId, propertyName, userId, userName, guestId, guestName, deviceId, deviceName, zoneId, zoneName, accessGroupId, accessGroupName, scheduleId, } = audit;
+                const { propertyId, propertyName, userId, userName, guestId, guestName, deviceId, deviceName, zoneId, zoneName, accessGroupId, accessGroupName, scheduleId, referenceId, } = audit;
                 if (propertyId && !propertyName) {
                     (0, config_1.getLogger)().info(`Property ID: ${propertyId}`);
                     if (propertyId === "triggered_externally") {
@@ -162,22 +162,32 @@ let AuditUtils = (() => {
                 if (userId && !userName)
                     audit.userName = await this.getUserName(userId);
                 if (guestId && !guestName)
-                    audit.guestName = "Guest";
-                if (guestName)
-                    audit.guestName = "Guest";
+                    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 (referenceId && !scheduleId)
+                    audit.scheduleId = await this.getScheduleId(referenceId);
+                if (scheduleId && !referenceId)
+                    audit.referenceId = await this.getReferenceId(scheduleId);
+                // if (scheduleId) {
+                //   const {
+                //     scheduleStartDate,
+                //     scheduleEndDate,
+                //     scheduleDuration,
+                //     scheduleSource,
+                //     scheduleStatus,
+                //     referenceId,
+                //   } = await this.getScheduleDetails(scheduleId);
+                //   audit.scheduleStartDate = scheduleStartDate;
+                //   audit.scheduleEndDate = scheduleEndDate;
+                //   audit.scheduleDuration = scheduleDuration;
+                //   audit.scheduleSource = scheduleSource;
+                //   audit.scheduleStatus = scheduleStatus;
+                //   audit.referenceId = referenceId;
+                // }
             }
             catch (error) {
                 (0, config_1.getLogger)().error(`Error in populateAuditFields: ${error instanceof Error ? error.message : error}`);
@@ -256,6 +266,20 @@ let AuditUtils = (() => {
                 return "";
             }
         }
+        async getGuestName(guestId) {
+            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 instanceof Error ? error.message : error}`);
+                return "";
+            }
+        }
         async getDeviceName(deviceId) {
             try {
                 return await this.getCachedEntityData("device", deviceId, async () => {
@@ -298,6 +322,34 @@ let AuditUtils = (() => {
                 return "";
             }
         }
+        async getScheduleId(referenceId) {
+            try {
+                return await this.getCachedEntityData("scheduleId", referenceId, async () => {
+                    const schedule = await typedi_1.default.get(pms_1.PmsService).getScheduleByReferenceId(referenceId);
+                    if (!schedule)
+                        return "";
+                    return schedule?.id || "";
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error(`Error in getScheduleId: ${error instanceof Error ? error.message : error}`);
+                return "";
+            }
+        }
+        async getReferenceId(scheduleId) {
+            try {
+                return await this.getCachedEntityData("referenceId", scheduleId, async () => {
+                    const schedule = await typedi_1.default.get(pms_1.PmsService).getSchedule(scheduleId);
+                    if (!schedule)
+                        return "";
+                    return schedule?.referenceId || "";
+                });
+            }
+            catch (error) {
+                (0, config_1.getLogger)().error(`Error in getReferenceId: ${error instanceof Error ? error.message : error}`);
+                return "";
+            }
+        }
         async getScheduleDetails(scheduleId) {
             try {
                 return await this.getCachedEntityData("schedule", scheduleId, async () => {
@@ -309,6 +361,7 @@ let AuditUtils = (() => {
                             scheduleDuration: 0,
                             scheduleSource: "",
                             scheduleStatus: "",
+                            referenceId: "",
                         };
                     }
                     const scheduleDuration = this.calculateScheduleDuration(schedule.startTime, schedule.endTime);
@@ -318,6 +371,7 @@ let AuditUtils = (() => {
                         scheduleDuration,
                         scheduleSource: schedule.source,
                         scheduleStatus: schedule.status,
+                        referenceId: schedule.referenceId,
                     };
                 });
             }
@@ -329,6 +383,7 @@ let AuditUtils = (() => {
                     scheduleDuration: 0,
                     scheduleSource: "",
                     scheduleStatus: "",
+                    referenceId: "",
                 };
             }
         }

package/dist/entities/pms/pms.repository.d.ts

@@ -3,6 +3,7 @@ export declare class PmsRepository {
     private readonly pmsPostgres;
     constructor();
     getSchedule(scheduleId: string): Promise<IPmsSchedule | null>;
+    getScheduleByReferenceId(referenceId: string): Promise<IPmsSchedule | null>;
     getScheduleIdByAccessGroupId(accessGroupId: string, status: string): Promise<string | null>;
     getGuest(guestId: string): Promise<IGuest | null>;
     getGuestId(scheduleId: string): Promise<string | null>;

package/dist/entities/pms/pms.repository.js

@@ -63,6 +63,19 @@ let PmsRepository = (() => {
                 throw new Error("Failed to get schedule");
             }
         }
+        async getScheduleByReferenceId(referenceId) {
+            try {
+                const schedule = await this.pmsPostgres.query(`SELECT * FROM dt_schedule WHERE "referenceId" = $1`, [referenceId]);
+                if (schedule.rows.length > 0) {
+                    return schedule.rows[0];
+                }
+                return null;
+            }
+            catch (error) {
+                console.error("Error in getScheduleByReferenceId:", error);
+                throw new Error("Failed to get schedule by reference ID");
+            }
+        }
         async getScheduleIdByAccessGroupId(accessGroupId, status) {
             const scheduleId = await this.pmsPostgres.query(`SELECT "scheduleId" FROM dt_schedule_accessgroup_map WHERE "accessGroupId" = $1 AND "status" = $2`, [accessGroupId, status]);
             //TODO: Need to Check if only one Schedule is there for the given Access Group in checked-in state!

package/dist/entities/pms/pms.service.d.ts

@@ -3,6 +3,7 @@ export declare class PmsService {
     private readonly pmsRepository;
     constructor();
     getSchedule(scheduleId: string): Promise<IPmsSchedule | null>;
+    getScheduleByReferenceId(referenceId: string): Promise<IPmsSchedule | null>;
     getScheduleIdByAccessGroupId(accessGroupId: string, status: string): Promise<string | null>;
     getGuest(guestId: string): Promise<IGuest | null>;
     getGuestId(scheduleId: string): Promise<string | null>;

package/dist/entities/pms/pms.service.js

@@ -92,6 +92,15 @@ let PmsService = (() => {
                 return null;
             return schedule;
         }
+        async getScheduleByReferenceId(referenceId) {
+            if (!referenceId) {
+                throw new Error("Reference ID is required");
+            }
+            const schedule = await this.pmsRepository.getScheduleByReferenceId(referenceId);
+            if (!schedule)
+                return null;
+            return schedule;
+        }
         async getScheduleIdByAccessGroupId(accessGroupId, status) {
             if (!accessGroupId) {
                 throw new Error("Access Group ID is required");

package/package.json

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