@7365admin1/core 3.11.0 → 3.12.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.12.0
+
+### Minor Changes
+
+- b225612: release changes in visitor api
+
 ## 3.11.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2742,6 +2742,7 @@ declare function MPerson(value: TPerson): {
 declare enum KeyStatus {
     AVAILABLE = "Available",
     RETURNED = "Returned",
+    REMOVED = "Removed",
     NOT_RETURNED = "Not Returned",
     LOST = "Lost",
     DAMAGED = "Damaged",
@@ -2765,6 +2766,7 @@ type TKeyRef = {
     remarks?: string;
     receivedDate?: Date;
     lastUpdate?: Date | null;
+    add?: boolean;
 };
 type TVisitorTransaction = {
     _id?: ObjectId;

package/dist/index.js

@@ -21126,14 +21126,20 @@ var schemaUpdateVisTrans = import_joi37.default.object({
     import_joi37.default.object({
       keyId: import_joi37.default.string().hex().length(24).required(),
       status: import_joi37.default.string().optional().allow(null, ""),
-      remarks: import_joi37.default.string().optional().allow(null, "")
+      remarks: import_joi37.default.string().optional().allow(null, ""),
+      receivedDate: import_joi37.default.string().optional().allow(null, ""),
+      lastUpdate: import_joi37.default.string().optional().allow(null, ""),
+      add: import_joi37.default.boolean().optional().allow(null, "")
     })
   ).optional().allow(null),
   passKeys: import_joi37.default.array().items(
     import_joi37.default.object({
       keyId: import_joi37.default.string().hex().length(24).required(),
       status: import_joi37.default.string().optional().allow(null, ""),
-      remarks: import_joi37.default.string().optional().allow(null, "")
+      remarks: import_joi37.default.string().optional().allow(null, ""),
+      receivedDate: import_joi37.default.string().optional().allow(null, ""),
+      lastUpdate: import_joi37.default.string().optional().allow(null, ""),
+      add: import_joi37.default.boolean().optional().allow(null, "")
     })
   ).optional().allow(null),
   checkInRemarks: import_joi37.default.string().optional().allow("", null),
@@ -21315,6 +21321,15 @@ async function convertObjectIdUtil2(id, fieldName) {
     throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
   }
 }
+function convertObjectIdUtilNonAsync(id, fieldName) {
+  try {
+    if (!id)
+      throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
+    return new import_mongodb40.ObjectId(id);
+  } catch (_) {
+    throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
+  }
+}
 
 // src/repositories/visitor-transaction.repo.ts
 var import_moment_timezone = __toESM(require("moment-timezone"));
@@ -21508,6 +21523,7 @@ function useVisitorTransactionRepo() {
               preserveNullAndEmptyArrays: true
             }
           },
+          // 1. Lookup visitorPass into a temporary field
           {
             $lookup: {
               from: "keys",
@@ -21519,48 +21535,66 @@ function useVisitorTransactionRepo() {
                     from: "qr-code-templates",
                     localField: "template",
                     foreignField: "_id",
-                    pipeline: [
-                      {
-                        $project: {
-                          _id: 1,
-                          prefixPass: 1,
-                          name: 1,
-                          remarks: 1
-                        }
-                      }
-                    ],
+                    pipeline: [{ $project: { prefixPass: 1, name: 1 } }],
                     as: "template"
                   }
                 },
                 {
                   $project: {
-                    _id: 0,
-                    keyId: "$_id",
-                    status: 1,
-                    description: 1,
-                    remarks: {
-                      $arrayElemAt: ["$template.remarks", 0]
-                    },
-                    templatePrefixPass: {
-                      $arrayElemAt: ["$template.prefixPass", 0]
-                    },
+                    _id: 1,
+                    // Kept only for matching purposes
                     prefixAndName: {
                       $concat: [
-                        {
-                          $ifNull: [
-                            { $arrayElemAt: ["$template.prefixPass", 0] },
-                            ""
-                          ]
-                        },
+                        { $ifNull: [{ $arrayElemAt: ["$template.prefixPass", 0] }, ""] },
                         { $ifNull: ["$name", ""] }
                       ]
                     }
                   }
                 }
               ],
-              as: "visitorPass"
+              as: "visitorPass_lookup"
+            }
+          },
+          // 2. Map through original array, keep all fields, and inject prefixAndName
+          {
+            $addFields: {
+              visitorPass: {
+                $map: {
+                  input: "$visitorPass",
+                  as: "original",
+                  in: {
+                    // Explicitly retain all original fields from your document
+                    keyId: "$$original.keyId",
+                    receivedDate: "$$original.receivedDate",
+                    status: "$$original.status",
+                    lastUpdate: "$$original.lastUpdate",
+                    remarks: "$$original.remarks",
+                    // Find and extract ONLY the prefixAndName string from lookup
+                    prefixAndName: {
+                      $let: {
+                        vars: {
+                          matched: {
+                            $arrayElemAt: [
+                              {
+                                $filter: {
+                                  input: "$visitorPass_lookup",
+                                  as: "lookup",
+                                  cond: { $eq: ["$$lookup._id", "$$original.keyId"] }
+                                }
+                              },
+                              0
+                            ]
+                          }
+                        },
+                        in: "$$matched.prefixAndName"
+                      }
+                    }
+                  }
+                }
+              }
             }
           },
+          // 3. Lookup passKeys into a temporary field
           {
             $lookup: {
               from: "keys",
@@ -21572,46 +21606,69 @@ function useVisitorTransactionRepo() {
                     from: "qr-code-templates",
                     localField: "template",
                     foreignField: "_id",
-                    pipeline: [
-                      {
-                        $project: {
-                          _id: 1,
-                          prefixPass: 1,
-                          name: 1,
-                          remarks: 1
-                        }
-                      }
-                    ],
+                    pipeline: [{ $project: { prefixPass: 1, name: 1 } }],
                     as: "template"
                   }
                 },
                 {
                   $project: {
-                    _id: 0,
-                    keyId: "$_id",
-                    status: 1,
-                    description: 1,
-                    remarks: {
-                      $arrayElemAt: ["$template.remarks", 0]
-                    },
-                    templatePrefixPass: {
-                      $arrayElemAt: ["$template.prefixPass", 0]
-                    },
+                    _id: 1,
                     prefixAndName: {
                       $concat: [
-                        {
-                          $ifNull: [
-                            { $arrayElemAt: ["$template.prefixPass", 0] },
-                            ""
-                          ]
-                        },
+                        { $ifNull: [{ $arrayElemAt: ["$template.prefixPass", 0] }, ""] },
                         { $ifNull: ["$name", ""] }
                       ]
                     }
                   }
                 }
               ],
-              as: "passKeys"
+              as: "passKeys_lookup"
+            }
+          },
+          // 4. Map through original passKeys array, keep all fields, inject prefixAndName
+          {
+            $addFields: {
+              passKeys: {
+                $map: {
+                  input: "$passKeys",
+                  as: "original",
+                  in: {
+                    // Explicitly retain all original fields from your document
+                    keyId: "$$original.keyId",
+                    receivedDate: "$$original.receivedDate",
+                    status: "$$original.status",
+                    lastUpdate: "$$original.lastUpdate",
+                    remarks: "$$original.remarks",
+                    // Find and extract ONLY the prefixAndName string from lookup
+                    prefixAndName: {
+                      $let: {
+                        vars: {
+                          matched: {
+                            $arrayElemAt: [
+                              {
+                                $filter: {
+                                  input: "$passKeys_lookup",
+                                  as: "lookup",
+                                  cond: { $eq: ["$$lookup._id", "$$original.keyId"] }
+                                }
+                              },
+                              0
+                            ]
+                          }
+                        },
+                        in: "$$matched.prefixAndName"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          // 5. Cleanup temporary arrays
+          {
+            $project: {
+              visitorPass_lookup: 0,
+              passKeys_lookup: 0
             }
           },
           {
@@ -21808,6 +21865,7 @@ function useVisitorTransactionRepo() {
     }
     try {
       const updateFields = {};
+      const pushFields = {};
       const arrayFilters = [];
       Object.keys(value).forEach((key) => {
         if (key !== "visitorPass" && key !== "passKeys") {
@@ -21817,34 +21875,63 @@ function useVisitorTransactionRepo() {
       });
       if (Array.isArray(value.visitorPass)) {
         value.visitorPass.forEach((item, index) => {
-          const elementKey = `vElem${index}`;
-          Object.keys(item).forEach((itemKey) => {
-            if (itemKey !== "keyId") {
-              const typedItemKey = itemKey;
-              let itemValue = item[typedItemKey];
-              updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = itemValue;
+          if (item.add === true) {
+            const { add: add2, ...cleanItem } = item;
+            cleanItem.keyId = convertObjectIdUtilNonAsync(cleanItem.keyId, "Pass Id");
+            if (!pushFields["visitorPass"]) {
+              pushFields["visitorPass"] = { $each: [] };
             }
-          });
-          arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
+            pushFields["visitorPass"].$each.push(cleanItem);
+          } else {
+            const elementKey = `vElem${index}`;
+            Object.keys(item).forEach((itemKey) => {
+              if (itemKey !== "keyId") {
+                const typedItemKey = itemKey;
+                let itemValue = item[typedItemKey];
+                updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = itemValue;
+              }
+            });
+            arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
+          }
         });
       }
       if (Array.isArray(value.passKeys)) {
         value.passKeys.forEach((item, index) => {
-          const elementKey = `pElem${index}`;
-          Object.keys(item).forEach((itemKey) => {
-            if (itemKey !== "keyId") {
-              const typedItemKey = itemKey;
-              let itemValue = item[typedItemKey];
-              updateFields[`passKeys.$[${elementKey}].${itemKey}`] = itemValue;
+          if (item.add === true) {
+            const { add: add2, ...cleanItem } = item;
+            cleanItem.keyId = convertObjectIdUtilNonAsync(cleanItem.keyId, "Key Id");
+            if (!pushFields["passKeys"]) {
+              pushFields["passKeys"] = { $each: [] };
             }
-          });
-          arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
+            pushFields["passKeys"].$each.push(cleanItem);
+          } else {
+            const elementKey = `pElem${index}`;
+            Object.keys(item).forEach((itemKey) => {
+              if (itemKey !== "keyId") {
+                const typedItemKey = itemKey;
+                let itemValue = item[typedItemKey];
+                updateFields[`passKeys.$[${elementKey}].${itemKey}`] = itemValue;
+              }
+            });
+            arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
+          }
         });
       }
+      const updatePayload = {};
+      if (Object.keys(updateFields).length > 0) {
+        updatePayload.$set = updateFields;
+      }
+      if (Object.keys(pushFields).length > 0) {
+        updatePayload.$push = pushFields;
+      }
       const result = await collection.updateOne(
         { _id: new import_mongodb41.ObjectId(_id) },
-        { $set: updateFields },
-        { arrayFilters, session }
+        updatePayload,
+        {
+          ...arrayFilters.length > 0 && { arrayFilters },
+          // Only pass if not empty
+          session
+        }
       );
       return result;
     } catch (error) {
@@ -34155,43 +34242,45 @@ function useVisitorTransactionService() {
           throw new import_node_server_utils106.BadRequestError("This plate number is blocklisted");
       }
       await KeyRepo.checkPassKeyAvailability(value.visitorPass, value.passKeys);
+      if (Array.isArray(value.visitorPass)) {
+        for (const item of value.visitorPass) {
+          item.receivedDate = /* @__PURE__ */ new Date();
+          item.status = "Not Returned" /* NOT_RETURNED */;
+          item.lastUpdate = null;
+          item.remarks = "";
+        }
+      }
+      if (Array.isArray(value.passKeys)) {
+        for (const item of value.passKeys) {
+          item.receivedDate = /* @__PURE__ */ new Date();
+          item.status = "Not Returned" /* NOT_RETURNED */;
+          item.lastUpdate = null;
+          item.remarks = "";
+        }
+      }
       const result = await _add(value, session);
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
           await KeyRepo.updateKeyById(
             item.keyId,
-            {
-              status: "In Use" /* IN_USE */,
-              updatedBy: value.createdBy
-            },
+            { status: "In Use" /* IN_USE */, updatedBy: value.createdBy },
             value.site,
             session,
             void 0,
             result
           );
-          item.receivedDate = /* @__PURE__ */ new Date();
-          item.status = "Not Returned" /* NOT_RETURNED */;
-          item.lastUpdate = null;
-          item.remarks = "";
         }
       }
       if (Array.isArray(value.passKeys)) {
         for (const item of value.passKeys) {
           await KeyRepo.updateKeyById(
             item.keyId,
-            {
-              status: "In Use" /* IN_USE */,
-              updatedBy: value.createdBy
-            },
+            { status: "In Use" /* IN_USE */, updatedBy: value.createdBy },
             value.site,
             session,
             void 0,
             result
           );
-          item.receivedDate = /* @__PURE__ */ new Date();
-          item.status = "Not Returned" /* NOT_RETURNED */;
-          item.lastUpdate = null;
-          item.remarks = "";
         }
       }
       await session?.commitTransaction();
@@ -34288,54 +34377,96 @@ function useVisitorTransactionService() {
       }
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
-          let status = "Invalid";
-          if (item?.status == "Returned" /* RETURNED */) {
-            status = "Available" /* AVAILABLE */;
-          } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
-            status = "In Use" /* IN_USE */;
-          } else if (item?.status && VALID_STATUSES.has(item.status)) {
-            status = item.status;
+          if (item.add) {
+            await KeyRepo.updateKeyById(
+              item.keyId,
+              {
+                status: "In Use" /* IN_USE */,
+                updatedBy: value.updatedBy
+              },
+              value.site,
+              session,
+              void 0,
+              id
+            );
+            item.receivedDate = /* @__PURE__ */ new Date();
+            item.status = "Not Returned" /* NOT_RETURNED */;
+            item.lastUpdate = null;
+            item.remarks = "";
           } else {
-            throw new Error("Invalid Visitor Pass Status");
+            let status = "Invalid";
+            if (item?.status == "Returned" /* RETURNED */) {
+              status = "Available" /* AVAILABLE */;
+            } else if (item?.status == "Removed" /* REMOVED */) {
+              status = "Available" /* AVAILABLE */;
+            } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
+              status = "In Use" /* IN_USE */;
+            } else if (item?.status && VALID_STATUSES.has(item.status)) {
+              status = item.status;
+            } else {
+              throw new Error("Invalid Visitor Pass Status");
+            }
+            await KeyRepo.updateKeyById(
+              item.keyId,
+              {
+                status,
+                updatedBy: value.updatedBy
+              },
+              value.site,
+              session,
+              void 0,
+              id
+            );
+            delete item.receivedDate;
+            item.lastUpdate = /* @__PURE__ */ new Date();
           }
-          await KeyRepo.updateKeyById(
-            item.keyId,
-            {
-              status,
-              updatedBy: value.updatedBy
-            },
-            value.site,
-            session,
-            void 0,
-            id
-          );
-          item.lastUpdate = /* @__PURE__ */ new Date();
         }
       }
       if (Array.isArray(value.passKeys)) {
         for (const item of value.passKeys) {
-          let status = "Invalid";
-          if (item?.status == "Returned" /* RETURNED */) {
-            status = "Available" /* AVAILABLE */;
-          } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
-            status = "In Use" /* IN_USE */;
-          } else if (item?.status && VALID_STATUSES.has(item.status)) {
-            status = item.status;
+          if (item.add) {
+            await KeyRepo.updateKeyById(
+              item.keyId,
+              {
+                status: "In Use" /* IN_USE */,
+                updatedBy: value.updatedBy
+              },
+              value.site,
+              session,
+              void 0,
+              id
+            );
+            item.receivedDate = /* @__PURE__ */ new Date();
+            item.status = "Not Returned" /* NOT_RETURNED */;
+            item.lastUpdate = null;
+            item.remarks = "";
           } else {
-            throw new Error("Invalid Visitor Pass Status");
+            let status = "Invalid";
+            if (item?.status == "Returned" /* RETURNED */) {
+              status = "Available" /* AVAILABLE */;
+            } else if (item?.status == "Removed" /* REMOVED */) {
+              status = "Available" /* AVAILABLE */;
+            } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
+              status = "In Use" /* IN_USE */;
+            } else if (item?.status && VALID_STATUSES.has(item.status)) {
+              status = item.status;
+            } else {
+              throw new Error("Invalid Visitor Pass Status");
+            }
+            await KeyRepo.updateKeyById(
+              item.keyId,
+              {
+                status,
+                updatedBy: value.updatedBy
+              },
+              value.site,
+              session,
+              void 0,
+              id
+            );
+            delete item.receivedDate;
+            item.lastUpdate = /* @__PURE__ */ new Date();
           }
-          await KeyRepo.updateKeyById(
-            item.keyId,
-            {
-              status,
-              updatedBy: value.updatedBy
-            },
-            value.site,
-            session,
-            void 0,
-            id
-          );
-          item.lastUpdate = /* @__PURE__ */ new Date();
         }
       }
       await _updateVisitorTansactionById(id, value, session);