dt-common-device 7.10.11 → 8.0.0

package/dist/config/config.d.ts

@@ -4,6 +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 getSqsQueueUrl(): string;
 export declare function getReservationSqsQueueUrl(): string;
 export declare function getEventSubscription(): InternalEventSubscription | null;

package/dist/config/config.js

@@ -7,6 +7,7 @@ exports.initialize = initialize;
 exports.getConfig = getConfig;
 exports.getDeviceServiceUrl = getDeviceServiceUrl;
 exports.getAdminServiceUrl = getAdminServiceUrl;
+exports.getDeviceProfileServiceUrl = getDeviceProfileServiceUrl;
 exports.getSqsQueueUrl = getSqsQueueUrl;
 exports.getReservationSqsQueueUrl = getReservationSqsQueueUrl;
 exports.getEventSubscription = getEventSubscription;
@@ -139,6 +140,17 @@ 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;
+    }
+    throw new Error("dt-common-device: DEVICE_PROFILE_SERVICE is not configured for this service");
+}
 function getSqsQueueUrl() {
     if (constants_1.CONFIG_KEYS[sourceKey].env.includes("AWS_SQS_URL")) {
         const sqsQueueUrl = process.env.AWS_SQS_URL;

package/dist/config/constants.js

@@ -13,6 +13,7 @@ exports.REQUIRED = {
         "POSTHOG_HOST",
         "DEVICE_SERVICE",
         "DT_API_KEY",
+        "MONITORING_SERVICE_PYTHON",
     ],
 };
 exports.CONFIG_KEYS = {

package/dist/entities/device/local/repository/Device.repository.js

@@ -194,7 +194,7 @@ let DeviceRepository = (() => {
         }
         async setBatteryLevel(deviceId, newBatteryLevel) {
             try {
-                const response = await this.axiosInstance.put(`/devices/${deviceId}/battery-level`, { newBatteryLevel });
+                const response = await this.axiosInstance.put(`/devices/${deviceId}/battery-level`, { batteryLevel: newBatteryLevel });
                 return response.data;
             }
             catch (error) {

package/dist/entities/device/local/repository/DeviceProfile.repository.js

@@ -49,7 +49,7 @@ let DeviceProfileRepository = (() => {
     let _classThis;
     var DeviceProfileRepository = _classThis = class {
         constructor() {
-            this.axiosInstance = (0, utils_1.getDeviceServiceAxiosInstance)();
+            this.axiosInstance = (0, utils_1.getDeviceProfileServiceAxiosInstance)();
         }
         async getDeviceBaseLine(deviceId) {
             try {

package/dist/entities/device/local/services/Device.service.d.ts

@@ -4,9 +4,9 @@ import { IAuditProperties } from "../../../../audit/IAuditProperties";
 export declare class LocalDeviceService {
     private readonly eventHandler;
     private readonly deviceRepository;
-    private readonly alertService;
     private readonly issueService;
     private readonly localPropertyService;
+    private readonly deviceProfileRepository;
     constructor();
     createDevice(body: IDevice): Promise<IDevice>;
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;

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

@@ -75,7 +75,6 @@ exports.LocalDeviceService = void 0;
 const EventHandler_1 = require("../../../../events/EventHandler");
 const lodash_1 = require("lodash");
 const Device_repository_1 = require("../repository/Device.repository");
-const Alert_service_1 = require("../../../../alerts/Alert.service");
 const Issue_service_1 = require("../../../../issues/Issue.service");
 const Service_1 = require("../../../../constants/Service");
 const typedi_1 = __importStar(require("typedi"));
@@ -84,6 +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");
 let LocalDeviceService = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -94,9 +94,9 @@ let LocalDeviceService = (() => {
             // Use dependency injection instead of creating new instances
             this.eventHandler = typedi_1.default.get(EventHandler_1.EventHandler);
             this.deviceRepository = typedi_1.default.get(Device_repository_1.DeviceRepository);
-            this.alertService = typedi_1.default.get(Alert_service_1.AlertService);
             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);
         }
         async createDevice(body) {
             const device = await this.deviceRepository.createDevice(body);
@@ -136,11 +136,20 @@ let LocalDeviceService = (() => {
                 else {
                     await this.handleOfflineStatus(device, device.status, body.status, auditBody?.source || Service_1.Source.SYSTEM, auditBody, body.status.error?.message);
                 }
-                // delete body.status;
+                // delete the status from the body, so it doesn't get updated in the database again!
+                delete body.status;
             }
-            if (body.state?.batteryPercentage?.value) {
+            if (body.state?.batteryPercentage?.value ||
+                body.state?.batteryPercentage?.value === 0) {
                 await this.setBatteryLevel(deviceId, body.state?.batteryPercentage?.value, auditBody?.source || Service_1.Source.SYSTEM, auditBody);
-                // delete body.state?.batteryPercentage;
+                // delete the battery percentage and battery state from the body, so it doesn't get updated in the database again!
+                delete body.state?.batteryPercentage;
+                delete body.state?.batteryState;
+            }
+            if (body.state?.lockState?.value) {
+                await this.setState(deviceId, { lockState: body.state.lockState }, auditBody);
+                // delete the lock state from the body, so it doesn't get updated in the database again!
+                delete body.state?.lockState;
             }
             await this.deviceRepository.updateDevice(deviceId, body);
             return await this.eventHandler.onDeviceUpdate(deviceId, body, auditBody);
@@ -206,7 +215,7 @@ let LocalDeviceService = (() => {
             }
             // If old state and new state are different
             const oldState = (await this.getState(deviceId))?.state ?? {};
-            const changedKeys = Object.keys(newState).filter((key) => !(0, lodash_1.isEqual)(oldState[key], newState[key]));
+            const changedKeys = Object.keys(newState).filter((key) => !(0, lodash_1.isEqual)(oldState[key].value.toLowerCase(), newState[key].value.toLowerCase()));
             if (changedKeys.length > 0) {
                 await this.deviceRepository.setState(deviceId, newState);
                 return await this.eventHandler.onStateChange(deviceId, newState, auditProperties, eventType);
@@ -342,10 +351,9 @@ let LocalDeviceService = (() => {
             }
         }
         async getDeviceBaseline(deviceId) {
-            // TODO: Implement device baseline retrieval
-            // This should return the baseline time in milliseconds for the specific device
-            // In a real implementation, this would fetch from device configuration or settings
-            return 3600000; // 1 hour in milliseconds
+            const response = await this.deviceProfileRepository.getDeviceBaseLine(deviceId);
+            const baselineInMilliseconds = response?.baseline && response?.baseline * 60 * 1000;
+            return baselineInMilliseconds ?? 3600000; // 1 hour in milliseconds
         }
         async getBatteryLevel(deviceId) {
             if (!deviceId) {
@@ -379,7 +387,7 @@ let LocalDeviceService = (() => {
                                 lastUpdated: new Date().toISOString(),
                             },
                         };
-                        await this.updateBatteryState(deviceId, batteryState);
+                        await this.setState(deviceId, batteryState, auditBody);
                         await this.eventHandler.onBatteryReplaced(deviceId, batteryLevel, auditBody);
                         // Cancel any existing battery issue
                         await this.issueService.performIssueAction({

package/dist/utils/http.utils.d.ts

@@ -8,6 +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;
 /**
  * Retry function for failed HTTP requests
  */

package/dist/utils/http.utils.js

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

package/package.json

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