dt-common-device 6.2.1 → 7.1.0

package/dist/alerts/Alert.model.js

@@ -48,6 +48,11 @@ const AlertSchema = new mongoose_1.Schema({
         required: true,
         index: true,
     },
+    zoneId: {
+        type: String,
+        required: true,
+        index: true,
+    },
     title: {
         type: String,
         required: true,
@@ -116,6 +121,7 @@ const AlertSchema = new mongoose_1.Schema({
 exports.AlertSchema = AlertSchema;
 // Compound indexes to match Prisma schema
 AlertSchema.index({ propertyId: 1, isActive: 1, isRead: 1 });
+AlertSchema.index({ zoneId: 1, category: 1 });
 AlertSchema.index({ entityId: 1, entityType: 1 });
 AlertSchema.index({ createdAt: 1 });
 // Pre-save middleware to update the updatedAt field

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

@@ -45,7 +45,7 @@ export declare class AlertRepository {
     /**
      * Get alert statistics
      */
-    getStatistics(propertyId?: string): Promise<{
+    getStatistics(propertyId?: string, zoneId?: string): Promise<{
         total: number;
         active: number;
         unread: number;
@@ -61,4 +61,38 @@ export declare class AlertRepository {
      * Bulk soft delete alerts
      */
     bulkSoftDelete(ids: string[], deletedBy: string): Promise<number>;
+    /**
+     * Find alerts by zone ID
+     */
+    findByZoneId(zoneId: string, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Find alerts by zone ID and category
+     */
+    findByZoneIdAndCategory(zoneId: string, category: AlertCategory, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Find alerts by zone ID and severity
+     */
+    findByZoneIdAndSeverity(zoneId: string, severity: AlertSeverity, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Find alerts by zone ID and active status
+     */
+    findByZoneIdAndActiveStatus(zoneId: string, isActive: boolean, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Find alerts by zone ID and read status
+     */
+    findByZoneIdAndReadStatus(zoneId: string, isRead: boolean, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Find alerts by multiple zone IDs
+     */
+    findByZoneIds(zoneIds: string[], includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Get alert statistics by zone ID and severity
+     */
+    getStatisticsByZoneAndSeverity(zoneId: string, severity?: AlertSeverity): Promise<{
+        total: number;
+        active: number;
+        unread: number;
+        snoozed: number;
+        byCategory: Record<AlertCategory, number>;
+    }>;
 }

package/dist/alerts/Alert.repository.js

@@ -52,6 +52,8 @@ let AlertRepository = (() => {
             const query = {};
             if (filters.propertyId)
                 query.propertyId = filters.propertyId;
+            if (filters.zoneId)
+                query.zoneId = filters.zoneId;
             if (filters.category)
                 query.category = filters.category;
             if (filters.severity)
@@ -215,11 +217,13 @@ let AlertRepository = (() => {
         /**
          * Get alert statistics
          */
-        async getStatistics(propertyId) {
+        async getStatistics(propertyId, zoneId) {
             try {
                 const query = { isDeleted: false };
                 if (propertyId)
                     query.propertyId = propertyId;
+                if (zoneId)
+                    query.zoneId = zoneId;
                 const [total, active, unread, snoozed, severityStats, categoryStats] = await Promise.all([
                     Alert_model_1.AlertModel.countDocuments(query),
                     Alert_model_1.AlertModel.countDocuments({ ...query, isActive: true }),
@@ -297,6 +301,147 @@ let AlertRepository = (() => {
                 throw new Error(`Failed to bulk soft delete alerts: ${error instanceof Error ? error.message : "Unknown error"}`);
             }
         }
+        /**
+         * Find alerts by zone ID
+         */
+        async findByZoneId(zoneId, includeDeleted = false) {
+            try {
+                const query = { zoneId };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Alert_model_1.AlertModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find alerts by zone ID: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
+        /**
+         * Find alerts by zone ID and category
+         */
+        async findByZoneIdAndCategory(zoneId, category, includeDeleted = false) {
+            try {
+                const query = { zoneId, category };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Alert_model_1.AlertModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find alerts by zone ID and category: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
+        /**
+         * Find alerts by zone ID and severity
+         */
+        async findByZoneIdAndSeverity(zoneId, severity, includeDeleted = false) {
+            try {
+                const query = { zoneId, severity };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Alert_model_1.AlertModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find alerts by zone ID and severity: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
+        /**
+         * Find alerts by zone ID and active status
+         */
+        async findByZoneIdAndActiveStatus(zoneId, isActive, includeDeleted = false) {
+            try {
+                const query = { zoneId, isActive };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Alert_model_1.AlertModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find alerts by zone ID and active status: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
+        /**
+         * Find alerts by zone ID and read status
+         */
+        async findByZoneIdAndReadStatus(zoneId, isRead, includeDeleted = false) {
+            try {
+                const query = { zoneId, isRead };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Alert_model_1.AlertModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find alerts by zone ID and read status: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
+        /**
+         * Find alerts by multiple zone IDs
+         */
+        async findByZoneIds(zoneIds, includeDeleted = false) {
+            try {
+                if (!zoneIds || zoneIds.length === 0) {
+                    throw new Error("Zone IDs array is required and cannot be empty");
+                }
+                const query = { zoneId: { $in: zoneIds } };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Alert_model_1.AlertModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find alerts by zone IDs: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
+        /**
+         * Get alert statistics by zone ID and severity
+         */
+        async getStatisticsByZoneAndSeverity(zoneId, severity) {
+            try {
+                const query = { isDeleted: false, zoneId };
+                if (severity)
+                    query.severity = severity;
+                const [total, active, unread, snoozed, categoryStats] = await Promise.all([
+                    Alert_model_1.AlertModel.countDocuments(query),
+                    Alert_model_1.AlertModel.countDocuments({ ...query, isActive: true }),
+                    Alert_model_1.AlertModel.countDocuments({ ...query, isRead: false }),
+                    Alert_model_1.AlertModel.countDocuments({
+                        ...query,
+                        snoozeUntil: { $exists: true, $ne: null },
+                    }),
+                    Alert_model_1.AlertModel.aggregate([
+                        { $match: query },
+                        { $group: { _id: "$category", count: { $sum: 1 } } },
+                    ]),
+                ]);
+                const byCategory = Object.values(alert_types_1.AlertCategory).reduce((acc, category) => {
+                    acc[category] = 0;
+                    return acc;
+                }, {});
+                categoryStats.forEach((stat) => {
+                    if (stat._id in byCategory) {
+                        byCategory[stat._id] = stat.count;
+                    }
+                });
+                return {
+                    total,
+                    active,
+                    unread,
+                    snoozed,
+                    byCategory,
+                };
+            }
+            catch (error) {
+                throw new Error(`Failed to get alert statistics by zone and severity: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
     };
     __setFunctionName(_classThis, "AlertRepository");
     (() => {

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

@@ -9,27 +9,27 @@ export declare class AlertService {
     /**
      * Create a readiness alert using AlertBuilder
      */
-    raiseReadinessAlert(propertyId: string, title: string, description: string, entityId?: string, entityType?: EntityType, createdBy?: string): Promise<IAlertDocument>;
+    raiseReadinessAlert(propertyId: string, zoneId: string, title: string, description: string, entityId?: string, entityType?: EntityType, createdBy?: string): Promise<IAlertDocument>;
     /**
      * Create an operations alert using AlertBuilder
      */
-    raiseOperationsAlert(propertyId: string, title: string, description: string, entityId?: string, entityType?: EntityType, createdBy?: string): Promise<IAlertDocument>;
+    raiseOperationsAlert(propertyId: string, zoneId: string, title: string, description: string, entityId?: string, entityType?: EntityType, createdBy?: string): Promise<IAlertDocument>;
     /**
      * Create a security alert using AlertBuilder
      */
-    raiseSecurityAlert(propertyId: string, title: string, description: string, entityId?: string, entityType?: EntityType, createdBy?: string): Promise<IAlertDocument>;
+    raiseSecurityAlert(propertyId: string, zoneId: string, title: string, description: string, entityId?: string, entityType?: EntityType, createdBy?: string): Promise<IAlertDocument>;
     /**
      * Create an energy alert using AlertBuilder
      */
-    raiseEnergyAlert(propertyId: string, title: string, description: string, entityId?: string, entityType?: EntityType, createdBy?: string): Promise<IAlertDocument>;
+    raiseEnergyAlert(propertyId: string, zoneId: string, title: string, description: string, entityId?: string, entityType?: EntityType, createdBy?: string): Promise<IAlertDocument>;
     /**
      * Create a device-specific alert using AlertBuilder
      */
-    raiseDeviceAlert(deviceId: string, propertyId: string, title: string, description: string, category?: AlertCategory, severity?: AlertSeverity, source?: Source): Promise<IAlertDocument>;
+    raiseDeviceAlert(deviceId: string, propertyId: string, zoneId: string, title: string, description: string, category?: AlertCategory, severity?: AlertSeverity, source?: Source): Promise<IAlertDocument>;
     /**
      * Create a hub-specific alert using AlertBuilder
      */
-    raiseHubAlert(hubId: string, propertyId: string, title: string, description: string, category?: AlertCategory, severity?: AlertSeverity, createdBy?: string): Promise<IAlertDocument>;
+    raiseHubAlert(hubId: string, propertyId: string, zoneId: string, title: string, description: string, category?: AlertCategory, severity?: AlertSeverity, createdBy?: string): Promise<IAlertDocument>;
     /**
      * Raise alert for device going offline (OPERATIONAL only)
      */
@@ -106,7 +106,7 @@ export declare class AlertService {
     /**
      * Get alert statistics with business logic
      */
-    getAlertStatistics(propertyId?: string): Promise<{
+    getAlertStatistics(propertyId?: string, zoneId?: string): Promise<{
         total: number;
         active: number;
         unread: number;
@@ -114,6 +114,40 @@ export declare class AlertService {
         bySeverity: Record<AlertSeverity, number>;
         byCategory: Record<AlertCategory, number>;
     }>;
+    /**
+     * Get alerts by zone ID
+     */
+    getAlertsByZoneId(zoneId: string, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Get alerts by zone ID and category
+     */
+    getAlertsByZoneIdAndCategory(zoneId: string, category: AlertCategory, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Get alerts by zone ID and severity
+     */
+    getAlertsByZoneIdAndSeverity(zoneId: string, severity: AlertSeverity, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Get alerts by multiple zone IDs
+     */
+    getAlertsByZoneIds(zoneIds: string[], includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Get alert statistics by zone ID and severity
+     */
+    getAlertStatisticsByZoneAndSeverity(zoneId: string, severity?: AlertSeverity): Promise<{
+        total: number;
+        active: number;
+        unread: number;
+        snoozed: number;
+        byCategory: Record<AlertCategory, number>;
+    }>;
+    /**
+     * Get alerts by zone ID and active status
+     */
+    getAlertsByZoneIdAndActiveStatus(zoneId: string, isActive: boolean, includeDeleted?: boolean): Promise<IAlertDocument[]>;
+    /**
+     * Get alerts by zone ID and read status
+     */
+    getAlertsByZoneIdAndReadStatus(zoneId: string, isRead: boolean, includeDeleted?: boolean): Promise<IAlertDocument[]>;
     private validateAlertData;
     private validateFilters;
     private validateUpdateData;

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.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.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");
             }

package/dist/alerts/AlertBuilder.d.ts

@@ -28,6 +28,10 @@ export declare class AlertBuilder {
      * 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

@@ -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/alert.types.d.ts

@@ -17,6 +17,7 @@ export interface AlertDocument {
     _id: string;
     category: AlertCategory;
     propertyId: string;
+    zoneId: string;
     title: string;
     description: string;
     entityId?: string;
@@ -34,6 +35,7 @@ export interface AlertDocument {
 export interface CreateAlertData {
     category: AlertCategory;
     propertyId: string;
+    zoneId: string;
     title: string;
     description: string;
     entityId?: string;
@@ -56,6 +58,7 @@ export interface UpdateAlertData {
 }
 export interface IAlertQuery {
     propertyId?: string;
+    zoneId?: string;
     category?: AlertCategory;
     severity?: AlertSeverity;
     entityType?: EntityType;

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

@@ -1,11 +1,11 @@
-import { IAccessGroup, IUser, IZone } from "./IAdmin";
+import { IAccessGroup, IUser, IZone, IZoneAccessGroup } from "./IAdmin";
 export declare class AdminRepository {
-    private readonly axiosInstance;
     private readonly deviceRepository;
     private readonly postgres;
     constructor();
     getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[]>;
     getAccessGroup(accessGroupId: string): Promise<IAccessGroup | null>;
+    getZoneAccessGroupByZoneId(zoneId: string): Promise<IZoneAccessGroup | null>;
     getZone(zoneId: string): Promise<IZone | null>;
     getUser(userId: string): Promise<IUser | null>;
 }

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));
@@ -177,6 +176,17 @@ let AdminRepository = (() => {
             }
             return null;
         }
+        async getZoneAccessGroupByZoneId(zoneId) {
+            const query = `
+      SELECT * FROM dt_zones_collection_map
+      WHERE "zoneId" = $1
+    `;
+            const result = await this.postgres.query(query, [zoneId]);
+            if (result.rows.length > 0) {
+                return result.rows[0];
+            }
+            return null;
+        }
         async getZone(zoneId) {
             try {
                 const zone = await this.postgres.query(`SELECT * FROM dt_zones WHERE "id" = $1`, [zoneId]);

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

@@ -4,6 +4,7 @@ export declare class AdminService {
     constructor();
     getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[] | undefined>;
     getAccessGroup(accessGroupId: string): Promise<IAccessGroup | null>;
+    getAccessGroupByZoneId(zoneId: string): Promise<IAccessGroup | null>;
     getZone(zoneId: string): Promise<IZone | null>;
     getUser(userId: string): Promise<IUser | null>;
 }

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

@@ -100,6 +100,18 @@ let AdminService = (() => {
                 return null;
             return accessGroup;
         }
+        async getAccessGroupByZoneId(zoneId) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            const zoneAccessGroup = await this.adminRepository.getZoneAccessGroupByZoneId(zoneId);
+            if (!zoneAccessGroup)
+                return null;
+            const accessGroup = await this.adminRepository.getAccessGroup(zoneAccessGroup.collectionId);
+            if (!accessGroup)
+                return null;
+            return accessGroup;
+        }
         async getZone(zoneId) {
             if (!zoneId) {
                 throw new Error("Zone ID is required");

package/dist/entities/admin/IAdmin.d.ts

@@ -12,6 +12,11 @@ export interface IAccessGroup {
     updatedAt: Date;
     accessibleBy: string[];
 }
+export interface IZoneAccessGroup {
+    id: string;
+    zoneId: string;
+    collectionId: string;
+}
 export interface IZone {
     id: string;
     name: string;

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>;
+    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,14 @@ let PmsRepository = (() => {
                 throw new Error("Failed to get schedule");
             }
         }
+        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!
+            if (scheduleId.rows.length > 0) {
+                return scheduleId.rows[0].scheduleId;
+            }
+            return null;
+        }
         async getGuest(guestId) {
             try {
                 const guest = await this.pmsPostgres.query(`SELECT * FROM dt_guest WHERE "id" = $1`, [guestId]);

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>;
+    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 getScheduleIdByAccessGroupId(accessGroupId, status) {
+            if (!accessGroupId) {
+                throw new Error("Access Group ID is required");
+            }
+            const scheduleId = await this.pmsRepository.getScheduleIdByAccessGroupId(accessGroupId, status);
+            if (!scheduleId)
+                return null;
+            return scheduleId;
+        }
         async getGuest(guestId) {
             if (!guestId) {
                 throw new Error("Guest ID is required");

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,
@@ -129,6 +134,7 @@ const IssueSchema = new mongoose_1.Schema({
 });
 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

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[]>;
 }

package/dist/issues/Issue.repository.js

@@ -52,6 +52,8 @@ let IssueRepository = (() => {
             const query = {};
             if (filters.propertyId)
                 query.propertyId = filters.propertyId;
+            if (filters.zoneId)
+                query.zoneId = filters.zoneId;
             if (filters.assignedTo)
                 query.assignedTo = filters.assignedTo;
             if (filters.status)
@@ -229,6 +231,8 @@ let IssueRepository = (() => {
                 };
                 if (filters.propertyId)
                     query.propertyId = filters.propertyId;
+                if (filters.zoneId)
+                    query.zoneId = filters.zoneId;
                 if (!filters.includeDeleted)
                     query.isDeleted = false;
                 const queryBuilder = Issue_model_1.IssueModel.find(query).sort({ createdAt: -1 });
@@ -246,11 +250,13 @@ let IssueRepository = (() => {
         /**
          * Get issue statistics
          */
-        async getStatistics(propertyId) {
+        async getStatistics(propertyId, zoneId) {
             try {
                 const query = { isDeleted: false };
                 if (propertyId)
                     query.propertyId = propertyId;
+                if (zoneId)
+                    query.zoneId = zoneId;
                 const [total, pending, inProgress, resolved, closed, overdue, priorityStats, categoryStats,] = await Promise.all([
                     Issue_model_1.IssueModel.countDocuments(query),
                     Issue_model_1.IssueModel.countDocuments({ ...query, status: issue_types_1.IssueStatus.PENDING }),
@@ -341,6 +347,57 @@ let IssueRepository = (() => {
                 throw new Error(`Failed to bulk soft delete issues: ${error instanceof Error ? error.message : "Unknown error"}`);
             }
         }
+        /**
+         * Find issues by zone ID
+         */
+        async findByZoneId(zoneId, includeDeleted = false) {
+            try {
+                const query = { zoneId };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Issue_model_1.IssueModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find issues by zone ID: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
+        /**
+         * Find issues by zone ID and status
+         */
+        async findByZoneIdAndStatus(zoneId, status, includeDeleted = false) {
+            try {
+                const query = { zoneId, status };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Issue_model_1.IssueModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find issues by zone ID and status: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
+        /**
+         * Find issues by multiple zone IDs
+         */
+        async findByZoneIds(zoneIds, includeDeleted = false) {
+            try {
+                if (!zoneIds || zoneIds.length === 0) {
+                    throw new Error("Zone IDs array is required and cannot be empty");
+                }
+                const query = { zoneId: { $in: zoneIds } };
+                if (!includeDeleted) {
+                    query.isDeleted = false;
+                }
+                const results = await Issue_model_1.IssueModel.find(query).sort({ createdAt: -1 });
+                return results.map((result) => result.toObject());
+            }
+            catch (error) {
+                throw new Error(`Failed to find issues by zone IDs: ${error instanceof Error ? error.message : "Unknown error"}`);
+            }
+        }
     };
     __setFunctionName(_classThis, "IssueRepository");
     (() => {

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

@@ -123,7 +123,7 @@ export declare class IssueService {
     /**
      * Get issue statistics with business logic
      */
-    getIssueStatistics(propertyId?: string): Promise<{
+    getIssueStatistics(propertyId?: string, zoneId?: string): Promise<{
         total: number;
         pending: number;
         inProgress: number;
@@ -138,10 +138,23 @@ export declare class IssueService {
      */
     searchIssues(searchTerm: string, filters?: {
         propertyId?: string;
+        zoneId?: string;
         includeDeleted?: boolean;
         limit?: number;
         skip?: number;
     }): Promise<IIssueDocument[]>;
+    /**
+     * Get issues by zone ID
+     */
+    getIssuesByZoneId(zoneId: string, includeDeleted?: boolean): Promise<IIssueDocument[]>;
+    /**
+     * Get issues by zone ID and status
+     */
+    getIssuesByZoneIdAndStatus(zoneId: string, status: string, includeDeleted?: boolean): Promise<IIssueDocument[]>;
+    /**
+     * Get issues by multiple zone IDs
+     */
+    getIssuesByZoneIds(zoneIds: string[], includeDeleted?: boolean): Promise<IIssueDocument[]>;
     private validateIssueData;
     private validateFilters;
     private validateUpdateData;

package/dist/issues/Issue.service.js

@@ -93,6 +93,7 @@ let IssueService = (() => {
         async createReadinessIssue(data) {
             const issueBuilder = IssueBuilder_1.IssueBuilder.createReadinessIssue()
                 .setPropertyId(data.propertyId)
+                .setZoneId(data.zoneId)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -112,6 +113,7 @@ let IssueService = (() => {
         async createOperationsIssue(data) {
             const issueBuilder = IssueBuilder_1.IssueBuilder.createOperationsIssue()
                 .setPropertyId(data.propertyId)
+                .setZoneId(data.zoneId)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -131,6 +133,7 @@ let IssueService = (() => {
         async createSecurityIssue(data) {
             const issueBuilder = IssueBuilder_1.IssueBuilder.createSecurityIssue()
                 .setPropertyId(data.propertyId)
+                .setZoneId(data.zoneId)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -150,6 +153,7 @@ let IssueService = (() => {
         async createEnergyIssue(data) {
             const issueBuilder = IssueBuilder_1.IssueBuilder.createEnergyIssue()
                 .setPropertyId(data.propertyId)
+                .setZoneId(data.zoneId)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -167,7 +171,7 @@ let IssueService = (() => {
          * Create a device-specific issue using IssueBuilder
          */
         async createDeviceIssue(data) {
-            const issueBuilder = IssueBuilder_1.IssueBuilder.createDeviceIssue(data.entityId, data.propertyId)
+            const issueBuilder = IssueBuilder_1.IssueBuilder.createDeviceIssue(data.entityId, data.propertyId, data.zoneId)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -185,7 +189,7 @@ let IssueService = (() => {
          * Create a hub-specific issue using IssueBuilder
          */
         async createHubIssue(data) {
-            const issueBuilder = IssueBuilder_1.IssueBuilder.createHubIssue(data.entityId, data.propertyId)
+            const issueBuilder = IssueBuilder_1.IssueBuilder.createHubIssue(data.entityId, data.propertyId, data.zoneId)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -203,7 +207,7 @@ let IssueService = (() => {
          * Create a user-specific issue using IssueBuilder
          */
         async createUserIssue(data) {
-            const issueBuilder = IssueBuilder_1.IssueBuilder.createUserIssue(data.entityId, data.propertyId)
+            const issueBuilder = IssueBuilder_1.IssueBuilder.createUserIssue(data.entityId, data.propertyId, data.zoneId)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -225,6 +229,7 @@ let IssueService = (() => {
                 entityId: device.deviceId,
                 entityType: issue_types_1.EntityType.DEVICE,
                 propertyId: device.propertyId,
+                zoneId: device.zoneId,
                 title: "Device Offline - Requires Attention",
                 description: `Device ${device.name} (${device.deviceId}) has been offline for longer than the baseline time. ${reason ? `Reason: ${reason}` : ""} This requires immediate attention to restore device functionality.`,
                 createdBy: source,
@@ -238,6 +243,7 @@ let IssueService = (() => {
                 entityId: device.deviceId,
                 entityType: issue_types_1.EntityType.DEVICE,
                 propertyId: device.propertyId,
+                zoneId: device.zoneId,
                 title: "Door Left Open - Requires Attention",
                 description: `Zone ${zone?.name} has a door left open, for more than 10 minutes. ${reason ? `Reason: ${reason}` : ""}. Please check the zone and close the door.`,
                 createdBy: source,
@@ -253,6 +259,7 @@ let IssueService = (() => {
                 entityId: device.deviceId,
                 entityType: issue_types_1.EntityType.DEVICE,
                 propertyId: device.propertyId,
+                zoneId: device.zoneId,
                 title: "Device Battery Low - Requires Attention",
                 description: `Device ${device.name} (${device.deviceId}) battery level is ${batteryLevel}%, which is below the property threshold of ${threshold}%. Please replace or charge the device battery.`,
                 createdBy: source,
@@ -268,6 +275,7 @@ let IssueService = (() => {
                 entityId: device.deviceId,
                 entityType: issue_types_1.EntityType.DEVICE,
                 propertyId: device.propertyId,
+                zoneId: device.zoneId,
                 title: `Device Malfunction - ${issueType} - Requires Attention`,
                 description: `Device ${device.name} (${device.deviceId}) has a malfunction: ${issueType}. ${reason ? `Reason: ${reason}` : ""} This requires immediate attention to resolve the device malfunction.`,
                 createdBy: source,
@@ -279,7 +287,7 @@ let IssueService = (() => {
          * Create a maintenance issue using IssueBuilder
          */
         async createMaintenanceIssue(data) {
-            const issueBuilder = IssueBuilder_1.IssueBuilder.createMaintenanceIssue(data.propertyId, data.entityId, data.entityType)
+            const issueBuilder = IssueBuilder_1.IssueBuilder.createMaintenanceIssue(data.propertyId, data.zoneId, data.entityId, data.entityType)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -293,7 +301,7 @@ let IssueService = (() => {
          * Create an urgent issue using IssueBuilder
          */
         async createUrgentIssue(data) {
-            const issueBuilder = IssueBuilder_1.IssueBuilder.createUrgentIssue(data.propertyId, data.entityId, data.entityType)
+            const issueBuilder = IssueBuilder_1.IssueBuilder.createUrgentIssue(data.propertyId, data.zoneId, data.entityId, data.entityType)
                 .setTitle(data.title)
                 .setDescription(data.description)
                 .setCreatedBy(data.createdBy);
@@ -569,8 +577,8 @@ let IssueService = (() => {
         /**
          * Get issue statistics with business logic
          */
-        async getIssueStatistics(propertyId) {
-            const stats = await this.issueRepository.getStatistics(propertyId);
+        async getIssueStatistics(propertyId, zoneId) {
+            const stats = await this.issueRepository.getStatistics(propertyId, zoneId);
             // Business logic: Calculate additional metrics
             const responseTime = this.calculateAverageResponseTime(stats);
             const resolutionRate = this.calculateResolutionRate(stats);
@@ -595,6 +603,36 @@ let IssueService = (() => {
             }
             return await this.issueRepository.search(searchTerm, filters);
         }
+        /**
+         * Get issues by zone ID
+         */
+        async getIssuesByZoneId(zoneId, includeDeleted = false) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            return await this.issueRepository.findByZoneId(zoneId, includeDeleted);
+        }
+        /**
+         * Get issues by zone ID and status
+         */
+        async getIssuesByZoneIdAndStatus(zoneId, status, includeDeleted = false) {
+            if (!zoneId) {
+                throw new Error("Zone ID is required");
+            }
+            if (!status) {
+                throw new Error("Status is required");
+            }
+            return await this.issueRepository.findByZoneIdAndStatus(zoneId, status, includeDeleted);
+        }
+        /**
+         * Get issues by multiple zone IDs
+         */
+        async getIssuesByZoneIds(zoneIds, includeDeleted = false) {
+            if (!zoneIds || zoneIds.length === 0) {
+                throw new Error("Zone IDs array is required and cannot be empty");
+            }
+            return await this.issueRepository.findByZoneIds(zoneIds, includeDeleted);
+        }
         // Private business logic methods
         validateIssueData(data) {
             if (!data.title || data.title.trim().length < 5) {
@@ -606,6 +644,9 @@ let IssueService = (() => {
             if (!data.propertyId) {
                 throw new Error("Property ID is required");
             }
+            if (!data.zoneId) {
+                throw new Error("Zone ID is required");
+            }
             if (!data.createdBy) {
                 throw new Error("Created by user ID is required");
             }

package/dist/issues/IssueBuilder.d.ts

@@ -30,6 +30,10 @@ export declare class IssueBuilder {
      * Sets the property ID
      */
     setPropertyId(propertyId: string): this;
+    /**
+     * Sets the zone ID
+     */
+    setZoneId(zoneId: string): this;
     /**
      * Sets the issue title
      */
@@ -85,25 +89,25 @@ export declare class IssueBuilder {
     /**
      * Creates a device-specific issue builder
      */
-    static createDeviceIssue(deviceId: string, propertyId: string): IssueBuilder;
+    static createDeviceIssue(deviceId: string, propertyId: string, zoneId: string): IssueBuilder;
     /**
      * Creates a hub-specific issue builder
      */
-    static createHubIssue(hubId: string, propertyId: string): IssueBuilder;
+    static createHubIssue(hubId: string, propertyId: string, zoneId: string): IssueBuilder;
     /**
      * Creates a user-specific issue builder
      */
-    static createUserIssue(userId: string, propertyId: string): IssueBuilder;
+    static createUserIssue(userId: string, propertyId: string, zoneId: string): IssueBuilder;
     /**
      * Creates a property-specific issue builder
      */
-    static createPropertyIssue(propertyId: string): IssueBuilder;
+    static createPropertyIssue(propertyId: string, zoneId: string): IssueBuilder;
     /**
      * Creates a maintenance issue builder
      */
-    static createMaintenanceIssue(propertyId: string, entityId?: string, entityType?: EntityType): IssueBuilder;
+    static createMaintenanceIssue(propertyId: string, zoneId: string, entityId?: string, entityType?: EntityType): IssueBuilder;
     /**
      * Creates an urgent issue builder
      */
-    static createUrgentIssue(propertyId: string, entityId?: string, entityType?: EntityType): IssueBuilder;
+    static createUrgentIssue(propertyId: string, zoneId: string, entityId?: string, entityType?: EntityType): IssueBuilder;
 }

package/dist/issues/IssueBuilder.js

@@ -44,6 +44,16 @@ class IssueBuilder {
         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 issue title
      */
@@ -124,6 +134,7 @@ class IssueBuilder {
         const requiredFields = [
             "category",
             "propertyId",
+            "zoneId",
             "title",
             "description",
             "entityId",
@@ -180,46 +191,51 @@ class IssueBuilder {
     /**
      * Creates a device-specific issue builder
      */
-    static createDeviceIssue(deviceId, propertyId) {
+    static createDeviceIssue(deviceId, propertyId, zoneId) {
         return new IssueBuilder()
             .setEntityType(issue_types_1.EntityType.DEVICE)
             .setEntityId(deviceId)
-            .setPropertyId(propertyId);
+            .setPropertyId(propertyId)
+            .setZoneId(zoneId);
     }
     /**
      * Creates a hub-specific issue builder
      */
-    static createHubIssue(hubId, propertyId) {
+    static createHubIssue(hubId, propertyId, zoneId) {
         return new IssueBuilder()
             .setEntityType(issue_types_1.EntityType.HUB)
             .setEntityId(hubId)
-            .setPropertyId(propertyId);
+            .setPropertyId(propertyId)
+            .setZoneId(zoneId);
     }
     /**
      * Creates a user-specific issue builder
      */
-    static createUserIssue(userId, propertyId) {
+    static createUserIssue(userId, propertyId, zoneId) {
         return new IssueBuilder()
             .setEntityType(issue_types_1.EntityType.USER)
             .setEntityId(userId)
-            .setPropertyId(propertyId);
+            .setPropertyId(propertyId)
+            .setZoneId(zoneId);
     }
     /**
      * Creates a property-specific issue builder
      */
-    static createPropertyIssue(propertyId) {
+    static createPropertyIssue(propertyId, zoneId) {
         return new IssueBuilder()
             .setEntityType(issue_types_1.EntityType.PROPERTY)
             .setEntityId(propertyId)
-            .setPropertyId(propertyId);
+            .setPropertyId(propertyId)
+            .setZoneId(zoneId);
     }
     /**
      * Creates a maintenance issue builder
      */
-    static createMaintenanceIssue(propertyId, entityId, entityType) {
+    static createMaintenanceIssue(propertyId, zoneId, entityId, entityType) {
         const builder = new IssueBuilder()
             .setCategory(issue_types_1.IssuesCategory.READINESS)
             .setPropertyId(propertyId)
+            .setZoneId(zoneId)
             .setPriority(issue_types_1.IssuePriority.MEDIUM);
         if (entityId)
             builder.setEntityId(entityId);
@@ -230,10 +246,11 @@ class IssueBuilder {
     /**
      * Creates an urgent issue builder
      */
-    static createUrgentIssue(propertyId, entityId, entityType) {
+    static createUrgentIssue(propertyId, zoneId, entityId, entityType) {
         const builder = new IssueBuilder()
             .setCategory(issue_types_1.IssuesCategory.OPERATIONS)
             .setPropertyId(propertyId)
+            .setZoneId(zoneId)
             .setPriority(issue_types_1.IssuePriority.URGENT);
         if (entityId)
             builder.setEntityId(entityId);

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

@@ -42,6 +42,7 @@ export interface IssueDocument {
     _id: string;
     category: IssuesCategory;
     propertyId: string;
+    zoneId: string;
     title: string;
     description: string;
     entityId?: string;
@@ -61,6 +62,7 @@ export interface IssueDocument {
 export interface CreateIssueData {
     category: IssuesCategory;
     propertyId: string;
+    zoneId: string;
     title: string;
     description: string;
     entityId: string;
@@ -90,6 +92,7 @@ export interface AddCommentData {
 }
 export interface IIssueQuery {
     propertyId?: string;
+    zoneId?: string;
     assignedTo?: string;
     status?: IssueStatus;
     priority?: IssuePriority;

package/dist/utils/http.utils.js

@@ -34,7 +34,7 @@ function createAxiosInstance(baseURL) {
         validateStatus: (status) => status < 500, // Don't throw on 4xx errors
         headers: {
             "Content-Type": "application/json",
-            "User-Agent": "dt-common-device/1.3.0",
+            "User-Agent": `dt-common-device/${require('../../package.json').version}`,
             "x-api-key": (0, config_1.getDTApiKey)(),
         },
     });

package/package.json

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