dt-common-device 7.2.6 → 7.3.0

package/dist/alerts/Alert.model.d.ts

@@ -13,7 +13,7 @@ interface IAlertModel extends Model<IAlertDocument, {}, IAlertMethods> {
     findSnoozed(includeDeleted?: boolean): Promise<IAlertDocument[]>;
     findExpiredSnooze(includeDeleted?: boolean): Promise<IAlertDocument[]>;
 }
-declare const AlertSchema: mongoose.Schema<IAlertDocument, IAlertModel, IAlertMethods, {}, {}, {}, mongoose.DefaultSchemaOptions, IAlertDocument, mongoose.Document<unknown, {}, mongoose.FlatRecord<IAlertDocument>, {}> & Omit<mongoose.FlatRecord<IAlertDocument> & Required<{
+declare const AlertSchema: mongoose.Schema<IAlertDocument, IAlertModel, IAlertMethods, {}, {}, {}, mongoose.DefaultSchemaOptions, IAlertDocument, mongoose.Document<unknown, {}, mongoose.FlatRecord<IAlertDocument>, {}, mongoose.ResolveSchemaOptions<mongoose.DefaultSchemaOptions>> & Omit<mongoose.FlatRecord<IAlertDocument> & Required<{
     _id: string;
 }> & {
     __v: number;

package/dist/alerts/Alert.model.js

@@ -117,7 +117,6 @@ const AlertSchema = new mongoose_1.Schema({
         default: Date.now,
     },
 }, {
-    timestamps: true,
     collection: "dt_alerts",
     toJSON: { virtuals: true },
     toObject: { virtuals: true },

package/dist/alerts/Alert.repository.d.ts

@@ -2,6 +2,7 @@ import { IAlertDocument } from "./Alert.model";
 import { CreateAlertData, UpdateAlertData, AlertCategory, AlertSeverity, IAlertQuery } from "./alert.types";
 export declare class AlertRepository {
     private buildQuery;
+    private buildOptions;
     /**
      * Create a new alert
      */

package/dist/alerts/Alert.repository.js

@@ -48,7 +48,7 @@ let AlertRepository = (() => {
     let _classExtraInitializers = [];
     let _classThis;
     var AlertRepository = _classThis = class {
-        async buildQuery(filters = {}) {
+        buildQuery(filters = {}) {
             const query = {};
             if (filters.propertyId)
                 query.propertyId = filters.propertyId;
@@ -68,18 +68,34 @@ let AlertRepository = (() => {
                 query.isRead = filters.isRead;
             if (!filters.includeDeleted)
                 query.isDeleted = false;
-            if (filters.type)
-                query.type = filters.type;
+            if (filters.type) {
+                if (Array.isArray(filters.type)) {
+                    query.type = { $in: filters.type };
+                }
+                else {
+                    query.type = filters.type;
+                }
+            }
             // Date filtering
             if (filters.startDate || filters.endDate) {
                 query.createdAt = {};
                 if (filters.startDate)
-                    query.createdAt.$gte = filters.startDate;
+                    query.createdAt.$gte = new Date(filters.startDate);
                 if (filters.endDate)
-                    query.createdAt.$lte = filters.endDate;
+                    query.createdAt.$lte = new Date(filters.endDate);
             }
             return query;
         }
+        buildOptions(filters = {}) {
+            const options = {};
+            if (filters.sort)
+                options.sort = filters.sort;
+            if (filters.skip)
+                options.skip = filters.skip;
+            if (filters.limit)
+                options.limit = filters.limit;
+            return options;
+        }
         /**
          * Create a new alert
          */
@@ -120,19 +136,9 @@ let AlertRepository = (() => {
          */
         async query(filters = {}) {
             try {
-                const query = await this.buildQuery(filters);
-                const queryBuilder = Alert_model_1.AlertModel.find(query);
-                if (filters.sort) {
-                    queryBuilder.sort(filters.sort);
-                }
-                else {
-                    queryBuilder.sort({ severity: -1, createdAt: -1 });
-                }
-                if (filters.skip)
-                    queryBuilder.skip(filters.skip);
-                if (filters.limit)
-                    queryBuilder.limit(filters.limit);
-                const results = await queryBuilder.exec();
+                const query = this.buildQuery(filters);
+                const options = this.buildOptions(filters);
+                const results = await Alert_model_1.AlertModel.find(query, null, options);
                 return results.map((result) => result.toObject());
             }
             catch (error) {
@@ -184,7 +190,7 @@ let AlertRepository = (() => {
          */
         async count(filters = {}) {
             try {
-                const query = await this.buildQuery(filters);
+                const query = this.buildQuery(filters);
                 return await Alert_model_1.AlertModel.countDocuments(query);
             }
             catch (error) {

package/dist/alerts/alert.types.d.ts

@@ -75,12 +75,12 @@ export interface IAlertQuery {
     severity?: AlertSeverity;
     entityType?: EntityType;
     entityId?: string;
-    type?: AlertType;
+    type?: AlertType | AlertType[];
     isActive?: boolean;
     isRead?: boolean;
     includeDeleted?: boolean;
-    startDate?: Date;
-    endDate?: Date;
+    startDate?: string;
+    endDate?: string;
     sort?: {
         [key: string]: 1 | -1;
     };

package/dist/constants/Event.d.ts

@@ -41,6 +41,7 @@ export declare const DT_EVENT_TYPES: {
             UNKNOWN: string;
         };
         BATTERY: {
+            REPLACED: string;
             STATE: {
                 REPLACE: string;
             };

package/dist/constants/Event.js

@@ -44,6 +44,7 @@ exports.DT_EVENT_TYPES = {
             UNKNOWN: "device.status.unknown",
         },
         BATTERY: {
+            REPLACED: "device.battery.replaced",
             STATE: {
                 REPLACE: "device.battery.state.replace",
             },

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/services/Device.service.d.ts

@@ -6,6 +6,7 @@ export declare class LocalDeviceService {
     private readonly deviceRepository;
     private readonly alertService;
     private readonly issueService;
+    private readonly localPropertyService;
     constructor();
     createDevice(body: IDevice): Promise<IDevice>;
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;

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

@@ -83,6 +83,7 @@ const IAuditProperties_1 = require("../../../../audit/IAuditProperties");
 const constants_1 = require("../../../../constants");
 const audit_1 = require("../../../../audit");
 const issue_types_1 = require("../../../../issues/issue.types");
+const property_1 = require("../../../property");
 let LocalDeviceService = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -95,6 +96,7 @@ let LocalDeviceService = (() => {
             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);
         }
         async createDevice(body) {
             const device = await this.deviceRepository.createDevice(body);
@@ -355,6 +357,11 @@ let LocalDeviceService = (() => {
                     // Save the battery level in the device
                     await this.deviceRepository.setBatteryLevel(deviceId, batteryLevel);
                     await this.eventHandler.onBatteryLevelChange(deviceId, batteryLevel, auditBody);
+                    if (oldBatteryLevel?.value < batteryLevel &&
+                        batteryLevel - oldBatteryLevel?.value > 10) {
+                        // Battery level has increased (considering as battery has been replaced)
+                        await this.eventHandler.onBatteryReplaced(deviceId, batteryLevel, auditBody);
+                    }
                     // Additional condition: if battery level is less than 50, update battery state to "replace"
                     if (batteryLevel < 50) {
                         const batteryState = {
@@ -402,11 +409,11 @@ let LocalDeviceService = (() => {
             }
         }
         async getPropertyBatteryThreshold(propertyId) {
-            // TODO: Implement property battery threshold retrieval
-            // This should return the battery threshold for the specific property
-            // For now, returning a default value of 20%
-            // In a real implementation, this would fetch from property configuration or settings
-            return 20; // 20% default threshold
+            const preferences = await this.localPropertyService.getPropertyPreferences(propertyId, ["batteryPreference"]);
+            if (!preferences) {
+                return 20; // 20% default threshold
+            }
+            return preferences?.settings?.batteryPreference?.value ?? 20;
         }
         async checkForDeviceMalfunctions(device, source, reason) {
             // TODO: Implement device malfunction detection logic

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/dist/events/EventHandler.d.ts

@@ -10,5 +10,6 @@ export declare class EventHandler {
     onStatusChangeMany(query: IStatusQuery, status: IStatus, auditProperties: IAuditProperties, eventType: any): Promise<void>;
     onBatteryLevelChange(deviceId: string, batteryLevel: number, auditProperties: IAuditProperties): Promise<void>;
     onBatteryStateChange(deviceId: string, batteryState: any, auditProperties: IAuditProperties): Promise<void>;
+    onBatteryReplaced(deviceId: string, batteryLevel: number, auditProperties: IAuditProperties): Promise<void>;
     onDeviceMetaChange(deviceId: string, metaData: Record<string, any>, auditProperties: IAuditProperties): Promise<void>;
 }

package/dist/events/EventHandler.js

@@ -135,6 +135,16 @@ let EventHandler = (() => {
                 },
             });
         }
+        async onBatteryReplaced(deviceId, batteryLevel, auditProperties) {
+            await (0, audit_1.pushAudit)({
+                auditType: Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.REPLACED,
+                auditData: {
+                    deviceId,
+                    batteryLevel,
+                    ...auditProperties,
+                },
+            });
+        }
         async onDeviceMetaChange(deviceId, metaData, auditProperties) {
             await (0, audit_1.pushAudit)({
                 auditType: Event_1.DT_EVENT_TYPES.DEVICE.METADATA.UPDATED,

package/dist/issues/Issue.model.d.ts

@@ -14,7 +14,7 @@ interface IIssueModel extends Model<IIssueDocument, {}, IIssueMethods> {
     findOverdue(includeDeleted?: boolean): Promise<IIssueDocument[]>;
     findUpcoming(days?: number, includeDeleted?: boolean): Promise<IIssueDocument[]>;
 }
-declare const IssueSchema: mongoose.Schema<IIssueDocument, IIssueModel, IIssueMethods, {}, {}, {}, mongoose.DefaultSchemaOptions, IIssueDocument, mongoose.Document<unknown, {}, mongoose.FlatRecord<IIssueDocument>, {}> & Omit<mongoose.FlatRecord<IIssueDocument> & Required<{
+declare const IssueSchema: mongoose.Schema<IIssueDocument, IIssueModel, IIssueMethods, {}, {}, {}, mongoose.DefaultSchemaOptions, IIssueDocument, mongoose.Document<unknown, {}, mongoose.FlatRecord<IIssueDocument>, {}, mongoose.ResolveSchemaOptions<mongoose.DefaultSchemaOptions>> & Omit<mongoose.FlatRecord<IIssueDocument> & Required<{
     _id: string;
 }> & {
     __v: number;

package/dist/issues/Issue.model.js

@@ -141,7 +141,6 @@ const IssueSchema = new mongoose_1.Schema({
         default: [],
     },
 }, {
-    timestamps: true,
     collection: "dt_issues",
     toJSON: { virtuals: true },
     toObject: { virtuals: true },

package/dist/issues/Issue.repository.d.ts

@@ -2,6 +2,7 @@ import { IIssueDocument } from "./Issue.model";
 import { CreateIssueData, UpdateIssueData, IssuePriority, IssuesCategory, IIssueQuery } from "./issue.types";
 export declare class IssueRepository {
     private buildQuery;
+    private buildOptions;
     /**
      * Create a new issue
      */

package/dist/issues/Issue.repository.js

@@ -48,7 +48,7 @@ let IssueRepository = (() => {
     let _classExtraInitializers = [];
     let _classThis;
     var IssueRepository = _classThis = class {
-        async buildQuery(filters) {
+        buildQuery(filters) {
             const query = {};
             if (filters.propertyId)
                 query.propertyId = filters.propertyId;
@@ -68,25 +68,35 @@ let IssueRepository = (() => {
                 query.entitySubType = filters.entitySubType;
             if (filters.entityId)
                 query.entityId = filters.entityId;
-            if (filters.type)
-                query.type = filters.type;
+            if (filters.type) {
+                if (Array.isArray(filters.type)) {
+                    query.type = { $in: filters.type };
+                }
+                else {
+                    query.type = filters.type;
+                }
+            }
             if (!filters.includeDeleted)
                 query.isDeleted = false;
             // Date filtering
             if (filters.startDate || filters.endDate) {
                 query.createdAt = {};
                 if (filters.startDate)
-                    query.createdAt.$gte = filters.startDate;
+                    query.createdAt.$gte = new Date(filters.startDate);
                 if (filters.endDate)
-                    query.createdAt.$lte = filters.endDate;
+                    query.createdAt.$lte = new Date(filters.endDate);
             }
+            return query;
+        }
+        buildOptions(filters) {
+            const options = {};
             if (filters.sort)
-                query.sort = filters.sort;
+                options.sort = filters.sort;
             if (filters.limit)
-                query.limit = filters.limit;
+                options.limit = filters.limit;
             if (filters.skip)
-                query.skip = filters.skip;
-            return query;
+                options.skip = filters.skip;
+            return options;
         }
         /**
          * Create a new issue
@@ -126,19 +136,9 @@ let IssueRepository = (() => {
          */
         async query(filters = {}) {
             try {
-                const query = await this.buildQuery(filters);
-                const queryBuilder = Issue_model_1.IssueModel.find(query);
-                if (filters.sort) {
-                    queryBuilder.sort(filters.sort);
-                }
-                else {
-                    queryBuilder.sort({ createdAt: -1 });
-                }
-                if (filters.skip)
-                    queryBuilder.skip(filters.skip);
-                if (filters.limit)
-                    queryBuilder.limit(filters.limit);
-                const results = await queryBuilder.exec();
+                const query = this.buildQuery(filters);
+                const options = this.buildOptions(filters);
+                const results = await Issue_model_1.IssueModel.find(query, null, options);
                 return results.map((result) => result.toObject());
             }
             catch (error) {
@@ -190,7 +190,7 @@ let IssueRepository = (() => {
          */
         async count(filters = {}) {
             try {
-                const query = await this.buildQuery(filters);
+                const query = this.buildQuery(filters);
                 return await Issue_model_1.IssueModel.countDocuments(query);
             }
             catch (error) {

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

@@ -124,14 +124,14 @@ export interface IIssueQuery {
     assignedTo?: string;
     status?: IssueStatus;
     priority?: IssuePriority;
-    type?: IssueType;
+    type?: IssueType | IssueType[];
     category?: IssuesCategory;
     entityType?: EntityType;
     entitySubType?: EntitySubType;
     entityId?: string;
     includeDeleted?: boolean;
-    startDate?: Date;
-    endDate?: Date;
+    startDate?: string;
+    endDate?: string;
     limit?: number;
     skip?: number;
     sort?: {

package/dist/utils/redis.utils.d.ts

@@ -72,4 +72,5 @@ export declare class RedisUtils {
     hgetAll(key: string): Promise<any>;
     sadd(key: string, member: string): Promise<number>;
     smembers(key: string): Promise<string[]>;
+    srem(key: string, ...members: string[]): Promise<number>;
 }

package/dist/utils/redis.utils.js

@@ -188,6 +188,15 @@ let RedisUtils = (() => {
         async smembers(key) {
             return await this.client.smembers(key);
         }
+        async srem(key, ...members) {
+            try {
+                return await this.client.srem(key, ...members);
+            }
+            catch (error) {
+                console.error(`Error removing members from set ${key}:`, error);
+                throw error;
+            }
+        }
     };
     __setFunctionName(_classThis, "RedisUtils");
     (() => {

package/package.json

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