dt-common-device 13.2.1 → 13.3.0

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

@@ -99,6 +99,7 @@ let AdminService = (() => {
                 return await this.adminRepository.getZonesByAccessGroups(accessGroupIds, type);
             }
             catch (error) {
+                console.log(error);
                 return [];
             }
         }
@@ -295,7 +296,6 @@ let AdminService = (() => {
             return await this.adminRepository.getAccessGroups(propertyId, accessibleBy);
         }
         async getChildCollectionsByParentIds(parentIds) {
-            console.log("parentIds for collection heirarchy:----->", parentIds);
             return await this.adminRepository.getChildCollectionsByParentIds(parentIds);
         }
         async deleteAllCollectionHierarchy(propertyId, source) {

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

@@ -6,6 +6,7 @@ export interface IAccessGroup {
     type: string;
     externalId?: string;
     refId?: string;
+    isActive: boolean;
     isDeleted: boolean;
     createdBy: string;
     createdAt: Date;
@@ -20,6 +21,7 @@ export interface IZoneAccessGroup {
 export interface IZone {
     id: string;
     name: string;
+    isActive: boolean;
     propertyId: string;
     parentId?: string;
     zoneTypeId: string;

package/dist/entities/pms/pms.service.js

@@ -145,33 +145,20 @@ let PmsService = (() => {
                 throw new Error("Access Group ID is required");
             }
             const scheduleAccessGroups = await this.pmsRepository.getScheduleAccessGroups(scheduleId);
-            console.log("Schedule Access Groups for consecutive room occupancy check:", scheduleAccessGroups);
             if (!scheduleAccessGroups || scheduleAccessGroups.length === 0) {
                 return false;
             }
             const orderedAccessGroups = [...scheduleAccessGroups].sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime());
-            console.log("Ordered Access Groups for consecutive room occupancy check:", orderedAccessGroups);
-            const matchingIndices = [];
-            for (let i = 0; i < orderedAccessGroups.length; i++) {
-                if (orderedAccessGroups[i].accessGroupId === accessGroupId) {
-                    matchingIndices.push(i);
-                }
-            }
-            if (matchingIndices.length === 0) {
-                return false;
-            }
-            const firstIndex = matchingIndices[0];
-            const lastIndex = matchingIndices[matchingIndices.length - 1];
-            // Ensure all occurrences are contiguous (no other room between them)
-            if (lastIndex - firstIndex + 1 !== matchingIndices.length) {
+            // First entry new code should be assigned
+            if (orderedAccessGroups.length < 2) {
                 return false;
             }
-            for (let i = firstIndex; i <= lastIndex; i++) {
-                if (orderedAccessGroups[i].accessGroupId !== accessGroupId) {
-                    return false;
-                }
-            }
-            return true;
+            const last = orderedAccessGroups?.at(-1);
+            const secondLast = orderedAccessGroups?.at(-2);
+            // True only if last and second last entries are same and equal to accessGroupId
+            return (last.accessGroupId === accessGroupId &&
+                secondLast.accessGroupId === accessGroupId //B A(secondLast) A(last)
+            );
         }
     };
     __setFunctionName(_classThis, "PmsService");

package/dist/issues/Issue.repository.js

@@ -141,7 +141,25 @@ let IssueRepository = (() => {
                 const query = this.buildQuery(filters);
                 const options = this.buildOptions(filters);
                 const results = await Issue_model_1.IssueModel.find(query, null, options);
-                return results?.map((result) => result.toObject()) || [];
+                let issues = results?.map((result) => result.toObject()) || [];
+                const offlineFilter = filters.filterOfflineLessThan24Hours;
+                if (offlineFilter) {
+                    const cutoff = offlineFilter.createdAt
+                        ? new Date(offlineFilter.createdAt)
+                        : new Date(Date.now() - 24 * 60 * 60 * 1000);
+                    if (!Number.isNaN(cutoff.getTime())) {
+                        issues = issues.filter((issue) => {
+                            const issueCreatedAt = new Date(issue.createdAt);
+                            if (Number.isNaN(issueCreatedAt.getTime()))
+                                return true;
+                            const matchesType = issue.type === offlineFilter.type;
+                            const matchesSubType = issue.entitySubType === offlineFilter.subType;
+                            const isOlderThanCutoff = issueCreatedAt < cutoff;
+                            return !(matchesType && matchesSubType && isOlderThanCutoff);
+                        });
+                    }
+                }
+                return issues;
             }
             catch (error) {
                 throw new Error(`Failed to find issues: ${error instanceof Error ? error.message : "Unknown error"}`);
@@ -193,7 +211,24 @@ let IssueRepository = (() => {
         async count(filters = {}) {
             try {
                 const query = this.buildQuery(filters);
-                return await Issue_model_1.IssueModel.countDocuments(query);
+                let total = await Issue_model_1.IssueModel.countDocuments(query);
+                const offlineFilter = filters.filterOfflineLessThan24Hours;
+                if (offlineFilter) {
+                    const cutoff = offlineFilter.createdAt
+                        ? new Date(offlineFilter.createdAt)
+                        : new Date(Date.now() - 24 * 60 * 60 * 1000);
+                    if (!Number.isNaN(cutoff.getTime())) {
+                        const excludeQuery = {
+                            ...query,
+                            type: offlineFilter.type,
+                            entitySubType: offlineFilter.subType,
+                            createdAt: { $lt: cutoff },
+                        };
+                        const excludeCount = await Issue_model_1.IssueModel.countDocuments(excludeQuery);
+                        total = Math.max(0, total - excludeCount);
+                    }
+                }
+                return total;
             }
             catch (error) {
                 throw new Error(`Failed to count issues: ${error instanceof Error ? error.message : "Unknown error"}`);

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

@@ -180,6 +180,11 @@ export interface IIssueQuery {
     includeDeleted?: boolean;
     startDate?: string;
     endDate?: string;
+    filterOfflineLessThan24Hours?: {
+        type: IssueType;
+        subType: EntitySubType;
+        createdAt?: string | Date;
+    };
     limit?: number;
     skip?: number;
     sort?: {

package/package.json

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