dt-common-device 7.6.14 → 7.7.0

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

@@ -48,6 +48,7 @@ export declare class AlertService {
      * Get all alerts with business logic filtering
      */
     queryAlerts(filters?: IAlertQuery): Promise<IAlertDocument[]>;
+    alertCount(filters: IAlertQuery): Promise<number>;
     /**
      * Update an alert with business logic validation
      */

package/dist/alerts/Alert.service.js

@@ -404,6 +404,11 @@ let AlertService = (() => {
             const enhancedFilters = this.applyBusinessRules(filters);
             return await this.alertRepository.query(enhancedFilters);
         }
+        async alertCount(filters) {
+            // Business logic: Apply business rules to filters
+            const enhancedFilters = this.applyBusinessRules(filters);
+            return await this.alertRepository.count(enhancedFilters);
+        }
         /**
          * Update an alert with business logic validation
          */

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/admin/Admin.repository.d.ts

@@ -6,7 +6,7 @@ export declare class AdminRepository {
     getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[]>;
     getZonesByAccessGroups(accessGroupIds: string[]): Promise<any[]>;
     getAccessGroup(accessGroupId: string): Promise<IAccessGroup | null>;
-    getZoneAccessGroupByZoneId(zoneId: string): Promise<IZoneAccessGroup | 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

@@ -215,7 +215,7 @@ let AdminRepository = (() => {
     `;
             const result = await this.postgres.query(query, [zoneId]);
             if (result.rows.length > 0) {
-                return result.rows[0];
+                return result.rows;
             }
             return null;
         }

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

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

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

@@ -114,13 +114,16 @@ let AdminService = (() => {
             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;
+            const zoneAccessGroups = await this.adminRepository.getZoneAccessGroupByZoneId(zoneId);
+            if (!zoneAccessGroups?.length)
+                return [];
+            const accessGroups = [];
+            for (const zoneAccessGroup of zoneAccessGroups) {
+                const accessGroup = await this.adminRepository.getAccessGroup(zoneAccessGroup.collectionId);
+                if (accessGroup)
+                    accessGroups.push(accessGroup);
+            }
+            return accessGroups;
         }
         async getZone(zoneId) {
             if (!zoneId) {

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

@@ -23,6 +23,10 @@ export interface IZone {
     propertyId: string;
     parentId?: string;
     zoneTypeId: string;
+    zoneType: {
+        id: string;
+        name: string;
+    };
     deviceHiveNetworkId?: string;
     createdAt: string;
     updatedAt: string;

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/issues/Issue.model.d.ts

@@ -14,9 +14,9 @@ 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>, {}, mongoose.ResolveSchemaOptions<mongoose.DefaultSchemaOptions>> & Omit<mongoose.FlatRecord<IIssueDocument> & Required<{
-    _id: string;
-}> & {
+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> & {
+    _id: mongoose.Types.ObjectId;
+} & {
     __v: number;
 }, keyof IIssueMethods> & IIssueMethods>;
 export declare const IssueModel: IIssueModel;

package/dist/issues/Issue.repository.js

@@ -50,6 +50,8 @@ let IssueRepository = (() => {
     var IssueRepository = _classThis = class {
         buildQuery(filters) {
             const query = {};
+            if (filters.id)
+                query._id = filters.id;
             if (filters.propertyId)
                 query.propertyId = filters.propertyId;
             if (filters.zoneId)

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

@@ -1,5 +1,5 @@
 import { IIssueDocument } from "./Issue.model";
-import { CreateIssueData, UpdateIssueData, AddCommentData, IssuePriority, IssuesCategory, EntityType, EntitySubType, IIssueQuery, IssueType } from "./issue.types";
+import { CreateIssueData, UpdateIssueData, AddCommentData, IssuePriority, IssuesCategory, EntityType, EntitySubType, IIssueQuery } from "./issue.types";
 import { IssueBuilder } from "./IssueBuilder";
 import { Source } from "../constants/Service";
 import { IDevice } from "../entities/device/local/interfaces";
@@ -30,15 +30,6 @@ export declare class IssueService {
      * Create a user-specific issue using IssueBuilder
      */
     createUserIssue(data: CreateIssueData): Promise<IIssueDocument | null>;
-    createCloudAccountAuthorizationIssue(data: {
-        propertyId: string;
-        entityId: string;
-        entityType: EntityType;
-        title: string;
-        description: string;
-        createdBy: string;
-        type: IssueType;
-    }): Promise<IIssueDocument | null>;
     /**
      * Create issue for device going offline longer than baseline
      */
@@ -54,9 +45,10 @@ export declare class IssueService {
     }, propertyId: string, source: Source): Promise<IIssueDocument | null>;
     createAccountUnauthorizedIssue(account: {
         accountId: string;
-        accountType: EntitySubType;
+        accountType: EntityType;
         propertyId: string;
         name: string;
+        accountSubType: EntitySubType;
     }, source: Source, reason?: string): Promise<IIssueDocument | null>;
     /**
      * Create issue for device malfunction (jammed or not accepting codes) (READINESS + OPERATIONAL)
@@ -84,6 +76,7 @@ export declare class IssueService {
      * Get all issues with business logic filtering
      */
     query(filters: IIssueQuery): Promise<IIssueDocument[]>;
+    issueCount(filters: IIssueQuery): Promise<number>;
     /**
      * Update an issue with business logic validation
      */

package/dist/issues/Issue.service.js

@@ -226,13 +226,6 @@ let IssueService = (() => {
                 issueBuilder.setZoneId(data.zoneId);
             return await this.createIssue(issueBuilder);
         }
-        async createCloudAccountAuthorizationIssue(data) {
-            const issueBuilder = IssueBuilder_1.IssueBuilder.createCloudAccountAuthorizationIssue(data.propertyId, data.entityId, data.entityType, data.type)
-                .setTitle(data.title)
-                .setDescription(data.description)
-                .setCreatedBy(data.createdBy);
-            return await this.createIssue(issueBuilder);
-        }
         /**
          * Create issue for device going offline longer than baseline
          */
@@ -290,8 +283,8 @@ let IssueService = (() => {
         async createAccountUnauthorizedIssue(account, source, reason) {
             return await this.createIssue({
                 entityId: account.accountId,
-                entityType: issue_types_1.EntityType.CLOUD_DEVICE_ACCOUNT,
-                entitySubType: account.accountType,
+                entityType: account?.accountType,
+                entitySubType: account?.accountSubType,
                 propertyId: account.propertyId,
                 title: "Account re-authorization required",
                 description: `${account.name}'s authorization has expired. Please re-authorize the account. ${reason ? `Reason: ${reason}.` : ""}`,
@@ -485,6 +478,11 @@ let IssueService = (() => {
             const enhancedFilters = this.applyBusinessRules(filters);
             return await this.issueRepository.query(enhancedFilters);
         }
+        async issueCount(filters) {
+            // Business logic: Apply business rules to filters
+            const enhancedFilters = this.applyBusinessRules(filters);
+            return await this.issueRepository.count(enhancedFilters);
+        }
         /**
          * Update an issue with business logic validation
          */
@@ -706,37 +704,45 @@ let IssueService = (() => {
                     updatedBy,
                     updatedAt: new Date(),
                 };
+                let auditType = "";
                 switch (action) {
                     case "in_progress":
                         newStatus = issue_types_1.IssueStatus.IN_PROGRESS;
+                        auditType = constants_1.DT_EVENT_TYPES.ISSUE.IN_PROGRESS.SUCCESS;
                         break;
                     case "resolve":
                         newStatus = issue_types_1.IssueStatus.RESOLVED;
                         updateData.resolvedAt = new Date();
+                        auditType = constants_1.DT_EVENT_TYPES.ISSUE.RESOLVE.SUCCESS;
                         break;
                     case "close":
                         newStatus = issue_types_1.IssueStatus.CLOSED;
+                        auditType = constants_1.DT_EVENT_TYPES.ISSUE.CLOSE.SUCCESS;
                         break;
                     case "cancel":
                         newStatus = issue_types_1.IssueStatus.CANCELLED;
+                        auditType = constants_1.DT_EVENT_TYPES.ISSUE.CANCEL.SUCCESS;
                         break;
                     case "on_hold":
                         newStatus = issue_types_1.IssueStatus.ON_HOLD;
+                        auditType = constants_1.DT_EVENT_TYPES.ISSUE.ON_HOLD.SUCCESS;
                         break;
                     case "ignore":
                         newStatus = issue_types_1.IssueStatus.IGNORED;
+                        auditType = constants_1.DT_EVENT_TYPES.ISSUE.IGNORE.SUCCESS;
                         break;
                     default:
                         throw new Error("Invalid action. Must be 'cancel', 'close', or 'resolve'");
                 }
                 updateData.status = newStatus;
                 // Update the issue
-                const updatedIssue = await this.updateIssue(issue._id, updateData);
+                const updatedIssue = await this.updateIssue(issue.id, updateData);
                 if (updatedIssue) {
                     // Log the action for audit purposes
-                    console.log(`Issue ${issue._id} has been ${action}ed by ${updatedBy}`);
+                    console.log(`Issue ${issue.id} has been ${action}ed by ${updatedBy}`);
+                    await dt_pub_sub_1.eventDispatcher.publishEvent(auditType, updatedIssue, "dt-common-device");
                     await (0, audit_1.pushAudit)({
-                        auditType: constants_1.DT_EVENT_TYPES.ISSUE.UPDATE.SUCCESS,
+                        auditType: auditType,
                         auditData: {
                             resource: audit_1.Resource.ISSUE,
                             source: Service_1.Source.USER,
@@ -764,6 +770,8 @@ let IssueService = (() => {
                         error: error,
                         updatedBy,
                         updatedAt: new Date(),
+                        actionPayload: query,
+                        action,
                     },
                 });
                 throw error;
@@ -896,12 +904,15 @@ let IssueService = (() => {
             const validTransitions = {
                 [issue_types_1.IssueStatus.PENDING]: [
                     issue_types_1.IssueStatus.IN_PROGRESS,
+                    issue_types_1.IssueStatus.RESOLVED,
+                    issue_types_1.IssueStatus.CLOSED,
                     issue_types_1.IssueStatus.CANCELLED,
                     issue_types_1.IssueStatus.ON_HOLD,
                     issue_types_1.IssueStatus.IGNORED,
                 ],
                 [issue_types_1.IssueStatus.IN_PROGRESS]: [
                     issue_types_1.IssueStatus.RESOLVED,
+                    issue_types_1.IssueStatus.CLOSED,
                     issue_types_1.IssueStatus.CANCELLED,
                     issue_types_1.IssueStatus.ON_HOLD,
                     issue_types_1.IssueStatus.IGNORED,
@@ -939,7 +950,12 @@ let IssueService = (() => {
             // Always exclude cancelled, resolved, and closed issues unless explicitly requested
             if (!enhancedFilters.status) {
                 enhancedFilters.status = {
-                    $nin: [issue_types_1.IssueStatus.CANCELLED, issue_types_1.IssueStatus.RESOLVED, issue_types_1.IssueStatus.CLOSED],
+                    $nin: [
+                        issue_types_1.IssueStatus.CANCELLED,
+                        issue_types_1.IssueStatus.RESOLVED,
+                        issue_types_1.IssueStatus.CLOSED,
+                        issue_types_1.IssueStatus.IGNORED,
+                    ],
                 };
             }
             return enhancedFilters;

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

@@ -57,7 +57,7 @@ export declare enum IssueType {
     DEVICE_MALFUNCTION = "DEVICE_MALFUNCTION"
 }
 export interface IssueDocument {
-    _id: string;
+    id: string;
     category: IssuesCategory;
     propertyId: string;
     zoneId?: string;
@@ -118,6 +118,7 @@ export interface AddCommentData {
     content: string;
 }
 export interface IIssueQuery {
+    id?: string;
     propertyId?: string;
     zoneId?: string;
     zoneName?: string;

package/package.json

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