dt-common-device 9.0.1 → 9.1.1

package/dist/alerts/Alert.service.js

@@ -606,7 +606,7 @@ let AlertService = (() => {
             if (alerts.length > 1) {
                 throw new Error("Multiple alerts found, please specify a more specific query");
             }
-            const alert = await Alert_model_1.AlertModel.findById(alerts[0]._id);
+            const alert = await Alert_model_1.AlertModel.findById(alerts[0]._id || alerts[0].id);
             if (!alert)
                 return null;
             alert.deactivate(updatedBy);
@@ -619,9 +619,7 @@ let AlertService = (() => {
             if (!id || !updatedBy) {
                 throw new Error("Alert ID and updated by user are required");
             }
-            if (!until) {
-                until = new Date(Date.now() + 1000 * 60 * 60 * 24); // 1 day
-            }
+            until ?? (until = new Date(Date.now() + 1000 * 60 * 60 * 24)); // 1 day
             // Business logic: Validate snooze date
             this.validateSnoozeDate(until);
             const alertModel = await Alert_model_1.AlertModel.findById(id);

package/dist/audit/AuditUtils.d.ts

@@ -18,7 +18,6 @@ export declare class AuditUtils {
     private getPropertyName;
     private getFieldFromDevice;
     private getUserName;
-    private getGuestName;
     private getDeviceName;
     private getZoneName;
     private getAccessGroupName;

package/dist/audit/AuditUtils.js

@@ -162,7 +162,9 @@ let AuditUtils = (() => {
                 if (userId && !userName)
                     audit.userName = await this.getUserName(userId);
                 if (guestId && !guestName)
-                    audit.guestName = await this.getGuestName(guestId);
+                    audit.guestName = "Guest";
+                if (guestName)
+                    audit.guestName = "Guest";
                 if (deviceId && !deviceName) {
                     audit.deviceName = await this.getDeviceName(deviceId);
                 }
@@ -254,20 +256,6 @@ 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 () => {

package/dist/audit/IAuditProperties.d.ts

@@ -30,7 +30,6 @@ export interface IAuditProperties {
     userId?: string;
     userName?: string;
     guestId?: string;
-    guestName?: string;
     deviceId?: string;
     deviceName?: string;
     zoneId?: string;

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

@@ -236,27 +236,37 @@ let LocalDeviceService = (() => {
                 throw new Error("Device ID and new status are required");
             }
             const device = await this.getDevice(deviceId);
-            const oldStatus = device.status;
-            const currentTime = new Date().toISOString();
-            // Determine if the new status is ONLINE or OFFLINE
-            const isNewStatusOnline = newStatus?.liveStatus === "ONLINE";
-            const isNewStatusOffline = newStatus?.liveStatus === "OFFLINE";
-            if (isNewStatusOffline) {
-                // New Status = OFFLINE
-                await this.handleOfflineStatus(device, oldStatus, newStatus, source, auditBody, reason, currentTime);
-            }
-            else if (isNewStatusOnline) {
-                // New Status = ONLINE
-                await this.handleOnlineStatus(device, oldStatus, newStatus, source, auditBody, reason, currentTime);
+            //NOTE: Baseline logic only apply for device type of LOCK
+            if (device?.deviceType?.type === "LOCK") {
+                const oldStatus = device.status;
+                const currentTime = new Date().toISOString();
+                // Determine if the new status is ONLINE or OFFLINE
+                const isNewStatusOnline = newStatus?.liveStatus === "ONLINE";
+                const isNewStatusOffline = newStatus?.liveStatus === "OFFLINE";
+                if (isNewStatusOffline) {
+                    // New Status = OFFLINE
+                    await this.handleOfflineStatus(device, oldStatus, newStatus, source, auditBody, reason, currentTime);
+                }
+                else if (isNewStatusOnline) {
+                    // New Status = ONLINE
+                    await this.handleOnlineStatus(device, oldStatus, newStatus, source, auditBody, reason, currentTime);
+                }
+                else {
+                    // For any other status, just update normally
+                    await this.deviceRepository.setStatus(deviceId, newStatus);
+                    await this.eventHandler.onStatusChange(deviceId, newStatus, auditBody, constants_1.DT_EVENT_TYPES.DEVICE.STATUS.UNKNOWN);
+                }
             }
             else {
-                // For any other status, just update normally
+                // For DeviceTypes other than LOCK, just update normally (HUB, THERMOSTATS)
+                const eventType = newStatus.online
+                    ? constants_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE
+                    : constants_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE;
                 await this.deviceRepository.setStatus(deviceId, newStatus);
-                await this.eventHandler.onStatusChange(deviceId, newStatus, auditBody, constants_1.DT_EVENT_TYPES.DEVICE.STATUS.UNKNOWN);
+                await this.eventHandler.onStatusChange(deviceId, newStatus, auditBody, eventType);
             }
         }
         async setStatusMany(query, newStatus, source, auditBody) {
-            //TODO: Compare old and new if different then update
             if (!query || !newStatus) {
                 throw new Error("Query and new status are required");
             }
@@ -266,15 +276,19 @@ let LocalDeviceService = (() => {
                 : constants_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE;
             const devices = await this.deviceRepository.queryDevices(query);
             for (const device of devices) {
-                if (newStatus.online) {
-                    await this.handleOnlineStatus(device, device.status, newStatus, source, auditBody);
+                if (device?.deviceType?.type === "LOCK") {
+                    if (newStatus.online) {
+                        await this.handleOnlineStatus(device, device.status, newStatus, source, auditBody);
+                    }
+                    else {
+                        await this.handleOfflineStatus(device, device.status, newStatus, source, auditBody);
+                    }
                 }
                 else {
-                    await this.handleOfflineStatus(device, device.status, newStatus, source, auditBody);
+                    await this.deviceRepository.setStatus(device.deviceId, newStatus);
+                    await this.eventHandler.onStatusChange(device.deviceId, newStatus, auditBody, eventType);
                 }
             }
-            await this.deviceRepository.setStatusMany(query, newStatus);
-            await this.eventHandler.onStatusChangeMany(query, newStatus, auditBody, eventType);
         }
         async handleOfflineStatus(device, oldStatus, newStatus, source, auditBody, reason, currentTime) {
             currentTime = currentTime ?? new Date().toISOString();

package/dist/issues/Issue.service.js

@@ -580,7 +580,7 @@ let IssueService = (() => {
                 });
             }
             // Add comment using the model instance methods
-            const issueModel = await Issue_model_1.IssueModel.findById({ _id: issueId });
+            const issueModel = await Issue_model_1.IssueModel.findById(issueId);
             if (issueModel) {
                 issueModel.addComment(commentData);
                 return await issueModel.save();

package/dist/issues/issue.types.d.ts

@@ -31,7 +31,7 @@ export declare enum EntitySubType {
     YANOLJA = "YANOLJA",
     SKYTOUCH = "SKYTOUCH",
     SMARTTHINGS = "SMARTTHINGS",
-    TTLock = "TTLock",
+    TTLOCK = "TTLOCK",
     TUYA = "TUYA",
     VERDANT = "VERDANT",
     SENSIBO = "SENSIBO",

package/dist/issues/issue.types.js

@@ -40,7 +40,7 @@ var EntitySubType;
     EntitySubType["SKYTOUCH"] = "SKYTOUCH";
     // DEVICE PROVIDERS
     EntitySubType["SMARTTHINGS"] = "SMARTTHINGS";
-    EntitySubType["TTLock"] = "TTLock";
+    EntitySubType["TTLOCK"] = "TTLOCK";
     EntitySubType["TUYA"] = "TUYA";
     EntitySubType["VERDANT"] = "VERDANT";
     EntitySubType["SENSIBO"] = "SENSIBO";

package/package.json

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