dt-common-device 13.4.13 → 13.4.15

package/dist/emails/emailService.js

@@ -90,13 +90,10 @@ let EmailService = (() => {
                 accessKeyId: process.env.AWS_ACCESS_KEY_ID ?? "",
                 secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY ?? "",
             };
-            console.log("credentials:------", credentials);
             const region = process.env.AWS_REGION ?? "us-east-1";
             this.s3Client = new client_s3_1.S3Client({ credentials, region });
             this.sesClient = new client_ses_1.SESClient({ credentials, region });
             this.propertyService = typedi_1.default.get(Property_service_1.LocalPropertyService);
-            console.log("s3Client:------", this.s3Client);
-            console.log("sesClient:------", this.sesClient);
         }
         async getTemplateForProperty(fileName, propertyId) {
             let res;
@@ -275,7 +272,6 @@ let EmailService = (() => {
                 (0, config_1.getLogger)().info(`Sending email to: ${maskedEmailsList.join(", ")}`);
             }
             catch (error) {
-                console.log("error in sendMail:------", error);
                 (0, config_1.getLogger)().error("sendMail: Error", JSON.stringify(error));
             }
         }

package/dist/entities/connection/Connection.repository.js

@@ -83,7 +83,15 @@ let ConnectionRepository = (() => {
             // Build conditions dynamically based on provided query parameters
             Object.keys(query).forEach((key) => {
                 const value = query[key];
-                if (value !== undefined && value !== null) {
+                if (value === undefined || value === null)
+                    return;
+                // ✅ Special handling for metaData (JSON)
+                if (key === "metaData" && typeof value === "object") {
+                    conditions.push(`"metaData" @> $${paramIndex}`);
+                    values.push(JSON.stringify(value));
+                    paramIndex++;
+                }
+                else {
                     conditions.push(`"${key}" = $${paramIndex}`);
                     values.push(value);
                     paramIndex++;

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

@@ -148,19 +148,30 @@ let PmsService = (() => {
             if (!scheduleAccessGroups || scheduleAccessGroups.length === 0) {
                 return false;
             }
-            const orderedAccessGroups = [...scheduleAccessGroups].sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime());
-            // First entry new code should be assigned
-            if (orderedAccessGroups.length < 2) {
+            // Split reservations often have multiple rows per schedule with the *same* startTime
+            // across different access groups. Sorting *all* rows globally made the last two entries
+            // always different access groups. Here we only consider rows for this accessGroupId,
+            // ordered by startTime, and require the latest segment to follow the previous one in time.
+            const rowsForThisAccessGroup = scheduleAccessGroups
+                .filter((row) => row.accessGroupId === accessGroupId)
+                .sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime());
+            if (rowsForThisAccessGroup.length < 2) {
                 return false;
             }
-            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 (
-            // This 1st condition doesnt seems to be required so verify with use case
-            last.accessGroupId === accessGroupId &&
-                secondLast.accessGroupId === accessGroupId //A(secondLast) A(last)
-            );
+            const previousSegment = rowsForThisAccessGroup.at(-2);
+            const currentSegment = rowsForThisAccessGroup.at(-1);
+            if (!previousSegment.endTime || !currentSegment.startTime) {
+                return false;
+            }
+            const previousStart = new Date(previousSegment.startTime).getTime();
+            const previousEnd = new Date(previousSegment.endTime).getTime();
+            const currentStart = new Date(currentSegment.startTime).getTime();
+            // Same startTime as previous row (duplicate import, extra map row, etc.) — still reuse one code.
+            if (currentStart === previousStart) {
+                return true;
+            }
+            // Consecutive nights: current segment starts at or after previous segment ends.
+            return currentStart >= previousEnd;
         }
     };
     __setFunctionName(_classThis, "PmsService");

package/package.json

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