dt-common-device 6.2.0 → 7.0.0

package/dist/alerts/Alert.service.js

@@ -89,9 +89,10 @@ let AlertService = (() => {
         /**
          * Create a readiness alert using AlertBuilder
          */
-        async raiseReadinessAlert(propertyId, title, description, entityId, entityType, createdBy) {
+        async raiseReadinessAlert(propertyId, zoneId, title, description, entityId, entityType, createdBy) {
             const alertBuilder = AlertBuilder_1.AlertBuilder.createReadinessAlert()
                 .setPropertyId(propertyId)
+                .setZoneId(zoneId)
                 .setTitle(title)
                 .setDescription(description);
             if (entityId)
@@ -105,9 +106,10 @@ let AlertService = (() => {
         /**
          * Create an operations alert using AlertBuilder
          */
-        async raiseOperationsAlert(propertyId, title, description, entityId, entityType, createdBy) {
+        async raiseOperationsAlert(propertyId, zoneId, title, description, entityId, entityType, createdBy) {
             const alertBuilder = AlertBuilder_1.AlertBuilder.createOperationsAlert()
                 .setPropertyId(propertyId)
+                .setZoneId(zoneId)
                 .setTitle(title)
                 .setDescription(description);
             if (entityId)
@@ -121,9 +123,10 @@ let AlertService = (() => {
         /**
          * Create a security alert using AlertBuilder
          */
-        async raiseSecurityAlert(propertyId, title, description, entityId, entityType, createdBy) {
+        async raiseSecurityAlert(propertyId, zoneId, title, description, entityId, entityType, createdBy) {
             const alertBuilder = AlertBuilder_1.AlertBuilder.createSecurityAlert()
                 .setPropertyId(propertyId)
+                .setZoneId(zoneId)
                 .setTitle(title)
                 .setDescription(description);
             if (entityId)
@@ -137,9 +140,10 @@ let AlertService = (() => {
         /**
          * Create an energy alert using AlertBuilder
          */
-        async raiseEnergyAlert(propertyId, title, description, entityId, entityType, createdBy) {
+        async raiseEnergyAlert(propertyId, zoneId, title, description, entityId, entityType, createdBy) {
             const alertBuilder = AlertBuilder_1.AlertBuilder.createEnergyAlert()
                 .setPropertyId(propertyId)
+                .setZoneId(zoneId)
                 .setTitle(title)
                 .setDescription(description);
             if (entityId)
@@ -153,8 +157,8 @@ let AlertService = (() => {
         /**
          * Create a device-specific alert using AlertBuilder
          */
-        async raiseDeviceAlert(deviceId, propertyId, title, description, category, severity, source) {
-            const alertBuilder = AlertBuilder_1.AlertBuilder.createDeviceAlert(deviceId, propertyId)
+        async raiseDeviceAlert(deviceId, propertyId, zoneId, title, description, category, severity, source) {
+            const alertBuilder = AlertBuilder_1.AlertBuilder.createDeviceAlert(deviceId, propertyId, zoneId)
                 .setTitle(title)
                 .setDescription(description);
             if (category)
@@ -168,8 +172,8 @@ let AlertService = (() => {
         /**
          * Create a hub-specific alert using AlertBuilder
          */
-        async raiseHubAlert(hubId, propertyId, title, description, category, severity, createdBy) {
-            const alertBuilder = AlertBuilder_1.AlertBuilder.createHubAlert(hubId, propertyId)
+        async raiseHubAlert(hubId, propertyId, zoneId, title, description, category, severity, createdBy) {
+            const alertBuilder = AlertBuilder_1.AlertBuilder.createHubAlert(hubId, propertyId, zoneId)
                 .setTitle(title)
                 .setDescription(description);
             if (category)
@@ -184,25 +188,25 @@ let AlertService = (() => {
          * Raise alert for device going offline (OPERATIONAL only)
          */
         async raiseDeviceOfflineAlert(device, source, reason) {
-            return await this.raiseDeviceAlert(device.deviceId, device.propertyId, "Device Offline", `Device ${device.name} (${device.deviceId}) has gone offline. ${reason ? `Reason: ${reason}` : ""}`, [alert_types_1.AlertCategory.OPERATIONS], alert_types_1.AlertSeverity.HIGH, source);
+            return await this.raiseDeviceAlert(device.deviceId, device.propertyId, device.zoneId, "Device Offline", `Device ${device.name} (${device.deviceId}) has gone offline. ${reason ? `Reason: ${reason}` : ""}`, alert_types_1.AlertCategory.OPERATIONS, alert_types_1.AlertSeverity.HIGH, source);
         }
         /**
          * Raise alert for device coming online (OPERATIONAL only)
          */
         async raiseDeviceOnlineAlert(device, source, reason) {
-            return await this.raiseDeviceAlert(device.deviceId, device.propertyId, "Device Online", `Device ${device.name} (${device.deviceId}) is now online. ${reason ? `Reason: ${reason}` : ""}`, [alert_types_1.AlertCategory.OPERATIONS], alert_types_1.AlertSeverity.INFO, source);
+            return await this.raiseDeviceAlert(device.deviceId, device.propertyId, device.zoneId, "Device Online", `Device ${device.name} (${device.deviceId}) is now online. ${reason ? `Reason: ${reason}` : ""}`, alert_types_1.AlertCategory.OPERATIONS, alert_types_1.AlertSeverity.INFO, source);
         }
         /**
          * Raise alert for device battery level below threshold (READINESS + OPERATIONAL + ENERGY)
          */
         async raiseDeviceBatteryAlert(device, batteryLevel, threshold, source) {
-            return await this.raiseDeviceAlert(device.deviceId, device.propertyId, "Device Battery Low", `Device ${device.name} (${device.deviceId}) battery level is ${batteryLevel}%, which is below the property threshold of ${threshold}%.`, [alert_types_1.AlertCategory.READINESS, alert_types_1.AlertCategory.OPERATIONS, alert_types_1.AlertCategory.ENERGY], alert_types_1.AlertSeverity.MEDIUM, source);
+            return await this.raiseDeviceAlert(device.deviceId, device.propertyId, device.zoneId, "Device Battery Low", `Device ${device.name} (${device.deviceId}) battery level is ${batteryLevel}%, which is below the property threshold of ${threshold}%.`, alert_types_1.AlertCategory.ENERGY, alert_types_1.AlertSeverity.MEDIUM, source);
         }
         /**
          * Raise alert for device issue (jammed or malfunctioned) (READINESS + OPERATIONAL)
          */
         async raiseDeviceIssueAlert(device, issueType, source, reason) {
-            return await this.raiseDeviceAlert(device.deviceId, device.propertyId, `Device Issue - ${issueType}`, `Device ${device.name} (${device.deviceId}) has an issue: ${issueType}. ${reason ? `Reason: ${reason}` : ""}`, [alert_types_1.AlertCategory.READINESS, alert_types_1.AlertCategory.OPERATIONS], alert_types_1.AlertSeverity.HIGH, source);
+            return await this.raiseDeviceAlert(device.deviceId, device.propertyId, device.zoneId, `Device Issue - ${issueType}`, `Device ${device.name} (${device.deviceId}) has an issue: ${issueType}. ${reason ? `Reason: ${reason}` : ""}`, alert_types_1.AlertCategory.READINESS, alert_types_1.AlertSeverity.HIGH, source);
         }
         /**
          * Create a new alert with business logic validation
@@ -401,8 +405,8 @@ let AlertService = (() => {
         /**
          * Get alert statistics with business logic
          */
-        async getAlertStatistics(propertyId) {
-            const stats = await this.alertRepository.getStatistics(propertyId);
+        async getAlertStatistics(propertyId, zoneId) {
+            const stats = await this.alertRepository.getStatistics(propertyId, zoneId);
             // Business logic: Add alerts for critical metrics
             if (stats.unread > 0) {
                 console.warn(`Alert: ${stats.unread} unread alerts require attention`);
@@ -415,6 +419,83 @@ let AlertService = (() => {
             }
             return stats;
         }
+        /**
+         * Get alerts by zone ID
+         */
+        async getAlertsByZoneId(zoneId, includeDeleted = false) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            return await this.alertRepository.findByZoneId(zoneId, includeDeleted);
+        }
+        /**
+         * Get alerts by zone ID and category
+         */
+        async getAlertsByZoneIdAndCategory(zoneId, category, includeDeleted = false) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            if (!category) {
+                throw new Error("Alert category is required");
+            }
+            return await this.alertRepository.findByZoneIdAndCategory(zoneId, category, includeDeleted);
+        }
+        /**
+         * Get alerts by zone ID and severity
+         */
+        async getAlertsByZoneIdAndSeverity(zoneId, severity, includeDeleted = false) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            if (!severity) {
+                throw new Error("Alert severity is required");
+            }
+            return await this.alertRepository.findByZoneIdAndSeverity(zoneId, severity, includeDeleted);
+        }
+        /**
+         * Get alerts by multiple zone IDs
+         */
+        async getAlertsByZoneIds(zoneIds, includeDeleted = false) {
+            if (!zoneIds || zoneIds.length === 0) {
+                throw new Error("Zone IDs array is required and cannot be empty");
+            }
+            return await this.alertRepository.findByZoneIds(zoneIds, includeDeleted);
+        }
+        /**
+         * Get alert statistics by zone ID and severity
+         */
+        async getAlertStatisticsByZoneAndSeverity(zoneId, severity) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            const stats = await this.alertRepository.getStatisticsByZoneAndSeverity(zoneId, severity);
+            // Business logic: Add alerts for critical metrics
+            if (stats.unread > 0) {
+                console.warn(`Alert: ${stats.unread} unread alerts in zone ${zoneId} require attention`);
+            }
+            if (severity === alert_types_1.AlertSeverity.CRITICAL && stats.total > 0) {
+                console.error(`Alert: ${stats.total} critical alerts in zone ${zoneId} require immediate attention`);
+            }
+            return stats;
+        }
+        /**
+         * Get alerts by zone ID and active status
+         */
+        async getAlertsByZoneIdAndActiveStatus(zoneId, isActive, includeDeleted = false) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            return await this.alertRepository.findByZoneIdAndActiveStatus(zoneId, isActive, includeDeleted);
+        }
+        /**
+         * Get alerts by zone ID and read status
+         */
+        async getAlertsByZoneIdAndReadStatus(zoneId, isRead, includeDeleted = false) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            return await this.alertRepository.findByZoneIdAndReadStatus(zoneId, isRead, includeDeleted);
+        }
         // Private business logic methods
         validateAlertData(data) {
             if (!data.title || data.title.trim().length < 3) {
@@ -426,6 +507,9 @@ let AlertService = (() => {
             if (!data.propertyId) {
                 throw new Error("Property ID is required");
             }
+            if (!data.zoneId) {
+                throw new Error("Zone ID is required");
+            }
             if (!data.entityType) {
                 throw new Error("Entity type is required");
             }
@@ -460,19 +544,6 @@ let AlertService = (() => {
                 [alert_types_1.AlertCategory.ENERGY]: alert_types_1.AlertSeverity.LOW,
                 [alert_types_1.AlertCategory.OTHER]: alert_types_1.AlertSeverity.MEDIUM,
             };
-            // If it's an array, use the highest severity category
-            if (Array.isArray(category)) {
-                const severities = category.map((cat) => categorySeverities[cat] || alert_types_1.AlertSeverity.MEDIUM);
-                const severityOrder = [
-                    alert_types_1.AlertSeverity.CRITICAL,
-                    alert_types_1.AlertSeverity.HIGH,
-                    alert_types_1.AlertSeverity.MEDIUM,
-                    alert_types_1.AlertSeverity.LOW,
-                    alert_types_1.AlertSeverity.INFO,
-                ];
-                return (severityOrder.find((severity) => severities.includes(severity)) ||
-                    alert_types_1.AlertSeverity.MEDIUM);
-            }
             return categorySeverities[category] || alert_types_1.AlertSeverity.MEDIUM;
         }
         applyBusinessRules(filters) {

package/dist/alerts/AlertBuilder.d.ts

@@ -23,11 +23,15 @@ export declare class AlertBuilder {
     /**
      * Sets the alert category
      */
-    setCategory(category: AlertCategory | AlertCategory[]): this;
+    setCategory(category: AlertCategory): this;
     /**
      * Sets the property ID
      */
     setPropertyId(propertyId: string): this;
+    /**
+     * Sets the zone ID
+     */
+    setZoneId(zoneId: string): this;
     /**
      * Sets the alert title
      */
@@ -79,9 +83,9 @@ export declare class AlertBuilder {
     /**
      * Creates a device-specific alert builder
      */
-    static createDeviceAlert(deviceId: string, propertyId: string): AlertBuilder;
+    static createDeviceAlert(deviceId: string, propertyId: string, zoneId: string): AlertBuilder;
     /**
      * Creates a hub-specific alert builder
      */
-    static createHubAlert(hubId: string, propertyId: string): AlertBuilder;
+    static createHubAlert(hubId: string, propertyId: string, zoneId: string): AlertBuilder;
 }

package/dist/alerts/AlertBuilder.js

@@ -29,7 +29,7 @@ class AlertBuilder {
      * Sets the alert category
      */
     setCategory(category) {
-        this.data.category = Array.isArray(category) ? category : [category];
+        this.data.category = category;
         return this;
     }
     /**
@@ -42,6 +42,16 @@ class AlertBuilder {
         this.data.propertyId = propertyId;
         return this;
     }
+    /**
+     * Sets the zone ID
+     */
+    setZoneId(zoneId) {
+        if (!zoneId || zoneId.trim() === "") {
+            throw new Error("Zone ID is required and cannot be empty");
+        }
+        this.data.zoneId = zoneId;
+        return this;
+    }
     /**
      * Sets the alert title
      */
@@ -112,6 +122,7 @@ class AlertBuilder {
         const requiredFields = [
             "category",
             "propertyId",
+            "zoneId",
             "title",
             "description",
             "entityType",
@@ -167,20 +178,22 @@ class AlertBuilder {
     /**
      * Creates a device-specific alert builder
      */
-    static createDeviceAlert(deviceId, propertyId) {
+    static createDeviceAlert(deviceId, propertyId, zoneId) {
         return new AlertBuilder()
             .setEntityType(alert_types_1.EntityType.DEVICE)
             .setEntityId(deviceId)
-            .setPropertyId(propertyId);
+            .setPropertyId(propertyId)
+            .setZoneId(zoneId);
     }
     /**
      * Creates a hub-specific alert builder
      */
-    static createHubAlert(hubId, propertyId) {
+    static createHubAlert(hubId, propertyId, zoneId) {
         return new AlertBuilder()
             .setEntityType(alert_types_1.EntityType.HUB)
             .setEntityId(hubId)
-            .setPropertyId(propertyId);
+            .setPropertyId(propertyId)
+            .setZoneId(zoneId);
     }
 }
 exports.AlertBuilder = AlertBuilder;

package/dist/alerts/AlertService.example.js

@@ -132,7 +132,7 @@ class AlertServiceExample {
      */
     async createAlertWithLegacyData() {
         const alertData = {
-            category: [alert_types_1.AlertCategory.OPERATIONS],
+            category: alert_types_1.AlertCategory.OPERATIONS,
             propertyId: "prop123",
             title: "Legacy Alert",
             description: "This alert was created using the old CreateAlertData format",

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

@@ -15,8 +15,9 @@ export declare enum AlertSeverity {
 }
 export interface AlertDocument {
     _id: string;
-    category: AlertCategory[];
+    category: AlertCategory;
     propertyId: string;
+    zoneId: string;
     title: string;
     description: string;
     entityId?: string;
@@ -32,8 +33,9 @@ export interface AlertDocument {
     updatedAt: Date;
 }
 export interface CreateAlertData {
-    category: AlertCategory[];
+    category: AlertCategory;
     propertyId: string;
+    zoneId: string;
     title: string;
     description: string;
     entityId?: string;
@@ -43,7 +45,7 @@ export interface CreateAlertData {
     snoozeUntil?: Date;
 }
 export interface UpdateAlertData {
-    category?: AlertCategory[];
+    category?: AlertCategory;
     title?: string;
     description?: string;
     entityId?: string;
@@ -56,7 +58,8 @@ export interface UpdateAlertData {
 }
 export interface IAlertQuery {
     propertyId?: string;
-    category?: AlertCategory | AlertCategory[];
+    zoneId?: string;
+    category?: AlertCategory;
     severity?: AlertSeverity;
     entityType?: EntityType;
     entityId?: string;

package/dist/entities/admin/Admin.repository.d.ts

@@ -1,6 +1,5 @@
 import { IAccessGroup, IUser, IZone } from "./IAdmin";
 export declare class AdminRepository {
-    private readonly axiosInstance;
     private readonly deviceRepository;
     private readonly postgres;
     constructor();

package/dist/entities/admin/Admin.repository.js

@@ -84,7 +84,6 @@ let AdminRepository = (() => {
     let _classThis;
     var AdminRepository = _classThis = class {
         constructor() {
-            this.axiosInstance = (0, utils_1.getAdminServiceAxiosInstance)();
             this.deviceRepository = typedi_1.default.get(Device_repository_1.DeviceRepository);
             this.postgres = (0, db_1.getPostgresClient)();
         }
@@ -112,7 +111,7 @@ let AdminRepository = (() => {
             const collectionZone = [];
             for (let zone of response) {
                 let zoneIds = [];
-                const zones = (await this.axiosInstance.get(`/zones/child?zoneId=${zone.zoneId}`))?.data?.data;
+                const zones = (await (0, utils_1.getAdminServiceAxiosInstance)().get(`/zones/child?zoneId=${zone.zoneId}`))?.data?.data;
                 zoneIds.push(zone.zoneId);
                 if (zones.childZones?.length > 0) {
                     const nestedZoneIds = new Set(_zones(zones.childZones));

package/dist/events/EventHandler.js

@@ -65,11 +65,6 @@ let EventHandler = (() => {
                     actionPayload: body,
                 },
             });
-            // const payload = {
-            //   eventType: DT_EVENT_TYPES.DEVICE.CREATE.SUCCESS,
-            //   properties: await this.auditUtils.buildAuditProperties(body),
-            // };
-            // await publishAudit(payload);
         }
         async onDeviceUpdate(deviceId, body, auditBody) {
             await (0, audit_1.pushAudit)({
@@ -80,15 +75,6 @@ let EventHandler = (() => {
                     ...auditBody,
                 },
             });
-            // const payload = {
-            //   eventType: DT_EVENT_TYPES.DEVICE.UPDATE.SUCCESS,
-            //   properties: await this.auditUtils.buildAuditProperties({
-            //     ...auditBody,
-            //     deviceId,
-            //     ...body,
-            //   }),
-            // };
-            // await publishAudit(payload);
         }
         async onDeviceDelete(deviceId, auditBody) {
             await (0, audit_1.pushAudit)({
@@ -98,14 +84,6 @@ let EventHandler = (() => {
                     ...auditBody,
                 },
             });
-            // const payload = {
-            //   eventType: DT_EVENT_TYPES.DEVICE.DELETE.SUCCESS,
-            //   properties: await this.auditUtils.buildAuditProperties({
-            //     ...auditBody,
-            //     deviceId,
-            //   }),
-            // };
-            // await publishAudit(payload);
         }
         async onStateChange(deviceId, state, auditProperties, eventType) {
             await (0, audit_1.pushAudit)({
@@ -116,15 +94,6 @@ let EventHandler = (() => {
                     ...auditProperties,
                 },
             });
-            // const payload = {
-            //   eventType: eventType || DT_EVENT_TYPES.DEVICE.STATE.CHANGED,
-            //   properties: await this.auditUtils.buildAuditProperties({
-            //     ...auditProperties,
-            //     deviceId,
-            //     ...state,
-            //   }),
-            // };
-            // await publishAudit(payload);
         }
         async onStatusChange(deviceId, status, auditProperties, eventType) {
             await (0, audit_1.pushAudit)({
@@ -135,15 +104,6 @@ let EventHandler = (() => {
                     ...auditProperties,
                 },
             });
-            // const payload = {
-            //   eventType: eventType || DT_EVENT_TYPES.DEVICE.STATUS.CHANGED,
-            //   properties: await this.auditUtils.buildAuditProperties({
-            //     ...auditProperties,
-            //     deviceId,
-            //     ...status,
-            //   }),
-            // };
-            // await publishAudit(payload);
         }
         async onStatusChangeMany(query, status, auditProperties, eventType) {
             await (0, audit_1.pushAudit)({
@@ -154,15 +114,6 @@ let EventHandler = (() => {
                     ...auditProperties,
                 },
             });
-            // const payload = {
-            //   eventType: eventType || DT_EVENT_TYPES.DEVICE.STATUS.UPDATED,
-            //   properties: await this.auditUtils.buildAuditProperties({
-            //     ...auditProperties,
-            //     ...query,
-            //     ...status,
-            //   }),
-            // };
-            // await publishAudit(payload);
         }
         async onBatteryLevelChange(deviceId, batteryLevel, auditProperties) {
             await (0, audit_1.pushAudit)({
@@ -173,15 +124,6 @@ let EventHandler = (() => {
                     ...auditProperties,
                 },
             });
-            // const payload = {
-            //   eventType: DT_EVENT_TYPES.DEVICE.BATTERY_LEVEL.UPDATED,
-            //   properties: await this.auditUtils.buildAuditProperties({
-            //     ...auditProperties,
-            //     deviceId,
-            //     batteryLevel,
-            //   }),
-            // };
-            // await publishAudit(payload);
         }
         async onDeviceMetaChange(deviceId, metaData, auditProperties) {
             await (0, audit_1.pushAudit)({
@@ -192,15 +134,6 @@ let EventHandler = (() => {
                     ...auditProperties,
                 },
             });
-            // const payload = {
-            //   eventType: DT_EVENT_TYPES.DEVICE.METADATA.UPDATED,
-            //   properties: await this.auditUtils.buildAuditProperties({
-            //     ...auditProperties,
-            //     deviceId,
-            //     metaData,
-            //   }),
-            // };
-            // await publishAudit(payload);
         }
     };
     __setFunctionName(_classThis, "EventHandler");

package/dist/issues/Issue.model.js

@@ -56,6 +56,11 @@ const IssueSchema = new mongoose_1.Schema({
         required: true,
         index: true,
     },
+    zoneId: {
+        type: String,
+        required: true,
+        index: true,
+    },
     title: {
         type: String,
         required: true,
@@ -123,9 +128,13 @@ const IssueSchema = new mongoose_1.Schema({
 }, {
     timestamps: true,
     collection: "dt_issues",
+    toJSON: { virtuals: true },
+    toObject: { virtuals: true },
+    id: false, // Disable the virtual id field since we're handling it manually
 });
 exports.IssueSchema = IssueSchema;
 IssueSchema.index({ propertyId: 1, status: 1 });
+IssueSchema.index({ zoneId: 1, status: 1 });
 IssueSchema.index({ assignedTo: 1, status: 1 });
 IssueSchema.index({ entityId: 1, entityType: 1 });
 // Pre-save middleware to update the updatedAt field
@@ -138,6 +147,35 @@ IssueSchema.pre(["updateOne", "findOneAndUpdate", "updateMany"], function (next)
     this.set({ updatedAt: new Date() });
     next();
 });
+// Post middleware to transform all find results to plain objects
+IssueSchema.post(/^find/, function (result) {
+    if (!result)
+        return;
+    // Handle array results (find)
+    if (Array.isArray(result)) {
+        result.forEach((doc) => {
+            if (doc && typeof doc.toObject === "function") {
+                const plainDoc = doc.toObject();
+                // Transform _id to id and remove __v
+                plainDoc.id = plainDoc._id ? plainDoc._id.toString() : plainDoc._id;
+                delete plainDoc._id;
+                delete plainDoc.__v;
+                // Replace the document with plain object
+                Object.assign(doc, plainDoc);
+            }
+        });
+    }
+    // Handle single document results (findOne, findById, etc.)
+    else if (result && typeof result.toObject === "function") {
+        const plainDoc = result.toObject();
+        // Transform _id to id and remove __v
+        plainDoc.id = plainDoc._id ? plainDoc._id.toString() : plainDoc._id;
+        delete plainDoc._id;
+        delete plainDoc.__v;
+        // Replace the document with plain object
+        Object.assign(result, plainDoc);
+    }
+});
 // Instance methods
 IssueSchema.methods.addComment = function (commentData) {
     const comment = {
@@ -225,8 +263,24 @@ IssueSchema.statics.findUpcoming = function (days = 7, includeDeleted = false) {
 IssueSchema.virtual("isActive").get(function () {
     return !this.isDeleted;
 });
-// Ensure virtuals are serialized
-IssueSchema.set("toJSON", { virtuals: true });
-IssueSchema.set("toObject", { virtuals: true });
+// Ensure virtuals are serialized and transform to plain objects
+IssueSchema.set("toJSON", {
+    virtuals: true,
+    transform: function (doc, ret) {
+        ret.id = ret._id ? ret._id.toString() : ret._id;
+        delete ret._id;
+        delete ret.__v;
+        return ret;
+    },
+});
+IssueSchema.set("toObject", {
+    virtuals: true,
+    transform: function (doc, ret) {
+        ret.id = ret._id ? ret._id.toString() : ret._id;
+        delete ret._id;
+        delete ret.__v;
+        return ret;
+    },
+});
 // Create and export the model
 exports.IssueModel = mongoose_1.default.model("Issue", IssueSchema);

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

@@ -47,6 +47,7 @@ export declare class IssueRepository {
      */
     search(searchTerm: string, filters?: {
         propertyId?: string;
+        zoneId?: string;
         includeDeleted?: boolean;
         limit?: number;
         skip?: number;
@@ -54,7 +55,7 @@ export declare class IssueRepository {
     /**
      * Get issue statistics
      */
-    getStatistics(propertyId?: string): Promise<{
+    getStatistics(propertyId?: string, zoneId?: string): Promise<{
         total: number;
         pending: number;
         inProgress: number;
@@ -72,4 +73,16 @@ export declare class IssueRepository {
      * Bulk soft delete issues
      */
     bulkSoftDelete(ids: string[], deletedBy: string): Promise<number>;
+    /**
+     * Find issues by zone ID
+     */
+    findByZoneId(zoneId: string, includeDeleted?: boolean): Promise<IIssueDocument[]>;
+    /**
+     * Find issues by zone ID and status
+     */
+    findByZoneIdAndStatus(zoneId: string, status: string, includeDeleted?: boolean): Promise<IIssueDocument[]>;
+    /**
+     * Find issues by multiple zone IDs
+     */
+    findByZoneIds(zoneIds: string[], includeDeleted?: boolean): Promise<IIssueDocument[]>;
 }