@7365admin1/core 2.36.0 → 2.37.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 2.37.0
+
+### Minor Changes
+
+- 933b3da: get latest changes
+
+## 2.36.1
+
+### Patch Changes
+
+- 4314116: remove dob entry deprecation upon update
+
 ## 2.36.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1709,7 +1709,10 @@ type TBuilding = {
     updatedAt?: Date | string;
     deletedAt?: Date | string;
     status?: string;
-    buildingFloorPlan?: string[];
+    buildingFiles?: Array<{
+        id: string;
+        name: string;
+    }>;
 };
 declare const schemaBuilding: Joi.ObjectSchema<any>;
 declare const schemaBuildingUpdateOptions: Joi.ObjectSchema<any>;
@@ -1749,7 +1752,10 @@ declare function MBuilding(value: TBuilding): {
     block: number;
     levels: string[];
     status: string;
-    buildingFloorPlan: string[];
+    buildingFiles: {
+        id: string;
+        name: string;
+    }[];
     createdAt: string | Date;
     updatedAt: string | Date;
     deletedAt: string | Date;
@@ -1790,14 +1796,14 @@ declare function useBuildingRepo(): {
         status?: BuildingStatus | undefined;
     }) => Promise<Record<string, any>>;
     getById: (_id: string | ObjectId) => Promise<TBuilding | null>;
-    updateById: (_id: ObjectId | string, value: Pick<TBuilding, "name" | "block" | "levels" | "buildingFloorPlan">, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
+    updateById: (_id: ObjectId | string, value: Pick<TBuilding, "name" | "block" | "levels" | "buildingFiles">, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getBuildingLevel: (site: string | ObjectId, block: number) => Promise<mongodb.WithId<bson.Document> | TBuilding | null>;
 };
 
 declare function useBuildingService(): {
     add: (value: TBuilding) => Promise<bson.ObjectId>;
-    updateById: (id: string, data: Pick<TBuilding, "name" | "block" | "levels" | "buildingFloorPlan">) => Promise<mongodb.UpdateResult<bson.Document>>;
+    updateById: (id: string, data: Pick<TBuilding, "name" | "block" | "levels" | "buildingFiles">) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (id: string) => Promise<string>;
 };
 
@@ -2577,7 +2583,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     plateNumber: string | undefined;
     recNo: string | undefined;
     checkIn: string | Date | null;
-    expectedCheckIn: string | Date | undefined;
+    expectedCheckIn: Date | undefined;
     checkOut: string | Date | undefined;
     status: VisitorStatus | undefined;
     remarks: string | undefined;
@@ -2608,6 +2614,8 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
         remarks: string;
         updatedBy: string | ObjectId;
     } | null;
+    arrivalTime: string | null | undefined;
+    duration: number | null | undefined;
 };
 
 declare const visitors_namespace_collection = "visitor.transactions";

package/dist/index.js

@@ -13387,12 +13387,12 @@ var schemaVisitorTransaction = import_joi36.default.object({
   numberOfPassengers: import_joi36.default.number().integer().optional().allow(null, ""),
   visitorPass: import_joi36.default.array().items(
     import_joi36.default.object({
-      keyId: import_joi36.default.string().hex().length(24).required()
+      keyId: import_joi36.default.string().hex().length(24).allow(null, "")
     })
   ).optional().allow(null),
   passKeys: import_joi36.default.array().items(
     import_joi36.default.object({
-      keyId: import_joi36.default.string().hex().length(24).required()
+      keyId: import_joi36.default.string().hex().length(24).allow(null, "")
     })
   ).optional().allow(null),
   checkInRemarks: import_joi36.default.string().optional().allow("", null),
@@ -13515,7 +13515,7 @@ function MVisitorTransaction(value) {
       throw new Error("Invalid invited ID.");
     }
   }
-  const newDate = (/* @__PURE__ */ new Date()).toISOString();
+  const newDate = /* @__PURE__ */ new Date();
   return {
     _id: value._id,
     name: value.name,
@@ -13530,7 +13530,7 @@ function MVisitorTransaction(value) {
     plateNumber: value.plateNumber,
     recNo: value.recNo,
     checkIn: value.checkIn === void 0 ? newDate : value.checkIn,
-    expectedCheckIn: value.expectedCheckIn,
+    expectedCheckIn: value.expectedCheckIn ? new Date(value.expectedCheckIn) : void 0,
     checkOut: value.checkOut,
     status: value.status,
     remarks: value.remarks,
@@ -13560,7 +13560,9 @@ function MVisitorTransaction(value) {
       status: "pending approval",
       remarks: "",
       updatedBy: value.invitedId ?? ""
-    } : null
+    } : null,
+    arrivalTime: value.arrivalTime,
+    duration: value.duration
   };
 }
 
@@ -13619,34 +13621,27 @@ function useVisitorTransactionRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
-    let checkOutFilter;
-    const checkIn = dateFrom ? { $gte: new Date(dateFrom).toISOString() } : void 0;
-    if (checkedOut === false) {
-      checkOutFilter = { checkOut: null };
-    } else if (checkedOut === true) {
-      checkOutFilter = dateTo ? {
-        checkOut: {
-          $ne: null,
-          $lte: new Date(dateTo).toISOString()
-        }
-      } : {
-        checkOut: { $ne: null }
-      };
-    } else if (dateTo) {
-      checkOutFilter = {
-        $or: [
-          { checkOut: { $lte: new Date(dateTo).toISOString() } },
-          { checkOut: null }
-        ]
-      };
+    const checkInFilter = {};
+    const expectedCheckInFilter = {};
+    if (status != "approved") {
+      if (dateFrom)
+        checkInFilter.$gte = new Date(dateFrom);
+      if (dateTo)
+        checkInFilter.$lte = new Date(dateTo);
+    } else {
+      if (dateFrom)
+        expectedCheckInFilter.$gte = new Date(dateFrom);
+      if (dateTo)
+        expectedCheckInFilter.$lte = new Date(dateTo);
     }
     const query = {
       status,
       ...import_mongodb40.ObjectId.isValid(org) && { org: new import_mongodb40.ObjectId(org) },
       ...import_mongodb40.ObjectId.isValid(site) && { site: new import_mongodb40.ObjectId(site) },
-      ...checkIn && { checkIn },
+      ...Object.keys(checkInFilter).length > 0 && { checkIn: checkInFilter },
+      ...Object.keys(expectedCheckInFilter).length > 0 && { expectedCheckIn: expectedCheckInFilter },
       ...Array.isArray(type) ? { type: { $in: type } } : type ? { type } : {},
-      ...checkOutFilter ?? {},
+      ...checkedOut == false && { checkOut: { $eq: null } },
       ...search && { $text: { $search: search } },
       ...plateNumber && { plateNumber }
     };
@@ -13869,7 +13864,7 @@ function useVisitorTransactionRepo() {
     } catch (error) {
       throw new import_node_server_utils68.BadRequestError("Invalid visitor transaction ID format.");
     }
-    value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    value.updatedAt = /* @__PURE__ */ new Date();
     if (value.checkOut) {
       value.manualCheckout = true;
     }
@@ -13893,8 +13888,8 @@ function useVisitorTransactionRepo() {
     try {
       const updateValue = {
         status: "deleted",
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        deletedAt: (/* @__PURE__ */ new Date()).toISOString()
+        updatedAt: /* @__PURE__ */ new Date(),
+        deletedAt: /* @__PURE__ */ new Date()
       };
       const res = await collection.updateOne({ _id }, { $set: updateValue });
       if (res.modifiedCount === 0) {
@@ -13907,7 +13902,7 @@ function useVisitorTransactionRepo() {
   }
   async function getDeliveryPickupTransactions() {
     try {
-      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const now = /* @__PURE__ */ new Date();
       const result = await collection.find(
         {
           type: {
@@ -13934,7 +13929,7 @@ function useVisitorTransactionRepo() {
   async function getExpiredCheckedOutTransactionsBySite(siteId) {
     const site = (0, import_node_server_utils68.toObjectId)(siteId);
     try {
-      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const now = /* @__PURE__ */ new Date();
       const expiredTransactions = await collection.find({
         $or: [
           { expiredAt: { $lte: now } },
@@ -13960,7 +13955,7 @@ function useVisitorTransactionRepo() {
         {
           $set: {
             dahuaSyncStatus,
-            updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+            updatedAt: /* @__PURE__ */ new Date()
           }
         },
         { session }
@@ -17171,13 +17166,15 @@ var schemaBuilding = import_joi43.default.object({
   updatedAt: import_joi43.default.date().optional().allow("", null),
   deletedAt: import_joi43.default.date().optional().allow("", null),
   status: import_joi43.default.string().optional().allow("", null),
-  buildingFloorPlan: import_joi43.default.array().items(import_joi43.default.string()).optional()
+  // buildingFloorPlan: Joi.array().items(Joi.string()).optional(),
+  buildingFiles: import_joi43.default.array().items({ id: import_joi43.default.string().hex().optional().allow("", null), name: import_joi43.default.string().optional().allow("", null) }).optional().allow("", null)
 });
 var schemaBuildingUpdateOptions = import_joi43.default.object({
   name: import_joi43.default.string().optional().allow("", null),
   levels: import_joi43.default.array().items(import_joi43.default.string().required()).min(1).required(),
   block: import_joi43.default.number().integer().min(1).required(),
-  buildingFloorPlan: import_joi43.default.array().items(import_joi43.default.string()).optional()
+  // buildingFloorPlan: Joi.array().items(Joi.string()).optional(),
+  buildingFiles: import_joi43.default.array().items({ id: import_joi43.default.string().hex().optional().allow("", null), name: import_joi43.default.string().optional().allow("", null) }).optional().allow("", null)
 });
 var schemaBilling = import_joi43.default.object({
   _id: import_joi43.default.string().hex().optional(),
@@ -17243,7 +17240,8 @@ function MBuilding(value) {
     block: value.block ?? 0,
     levels: value.levels ?? "",
     status: value.status ?? "active",
-    buildingFloorPlan: value.buildingFloorPlan ?? [],
+    // buildingFloorPlan: value.buildingFloorPlan ?? [],
+    buildingFiles: value.buildingFiles ?? [],
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? "",
     deletedAt: value.deletedAt ?? ""
@@ -18149,11 +18147,11 @@ function useBuildingService() {
     }
     try {
       await session.startTransaction();
-      const buildingFloorPlans = value?.buildingFloorPlan ?? [];
-      if (buildingFloorPlans.length > 0) {
-        for (const buildingFloorPlan of buildingFloorPlans) {
+      const buildingFiles = value?.buildingFiles ?? [];
+      if (buildingFiles.length > 0) {
+        for (const buildingFile of buildingFiles) {
           const file = await updateStatusById(
-            buildingFloorPlan,
+            buildingFile.id,
             { status: "active" },
             session
           );
@@ -18187,12 +18185,12 @@ function useBuildingService() {
       if (!building) {
         throw new import_node_server_utils82.NotFoundError("Building not found.");
       }
-      const dataFloorPlans = data?.buildingFloorPlan || [];
-      const buildingFloorPlans = building?.buildingFloorPlan || [];
+      const dataFiles = data?.buildingFiles || [];
+      const buildingFiles = building?.buildingFiles || [];
       const deletedFiles = [];
-      buildingFloorPlans.forEach((id2) => {
-        if (!dataFloorPlans.includes(id2)) {
-          deletedFiles.push(id2);
+      buildingFiles.forEach((file) => {
+        if (!dataFiles.find((f) => f.id === file.id)) {
+          deletedFiles.push(file.id);
         }
       });
       if (deletedFiles.length > 0) {
@@ -18288,7 +18286,8 @@ function useBuildingController() {
       levels: import_joi44.default.array().items(import_joi44.default.string().required()).min(1).required(),
       serial: import_joi44.default.string().optional().allow("", null),
       status: import_joi44.default.string().optional().allow("", null),
-      buildingFloorPlan: import_joi44.default.array().items(import_joi44.default.string()).optional()
+      // buildingFloorPlan: Joi.array().items(Joi.string()).optional(),
+      buildingFiles: import_joi44.default.array().items({ id: import_joi44.default.string().hex().optional().allow("", null), name: import_joi44.default.string().optional().allow("", null) }).optional().allow("", null)
     });
     const { error } = validation.validate(value);
     if (error) {
@@ -21976,6 +21975,8 @@ function useVisitorTransactionService() {
                 try {
                   const updatePayload = { status: "In Use" /* IN_USE */ };
                   const visitorPassId = typeof vp === "string" || vp instanceof import_mongodb58.ObjectId ? vp : vp.keyId;
+                  if (!visitorPassId)
+                    value.visitorPass = [];
                   await KeyRepo.updateKeyById(
                     visitorPassId,
                     updatePayload,
@@ -21991,6 +21992,8 @@ function useVisitorTransactionService() {
                 try {
                   const updatePayload = { status: "In Use" /* IN_USE */ };
                   const passKeyId = typeof pk === "string" || pk instanceof import_mongodb58.ObjectId ? pk : pk.keyId;
+                  if (!passKeyId)
+                    value.passKeys = [];
                   await KeyRepo.updateKeyById(
                     passKeyId,
                     updatePayload,
@@ -22102,11 +22105,13 @@ function useVisitorTransactionService() {
           value.recNo = parsed.recNo;
         }
       }
-      if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0) {
+      if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0 && value.visitorPass) {
         for (const vp of value.visitorPass) {
           try {
             const updatePayload = { status: "In Use" /* IN_USE */ };
             const visitorPassId = typeof vp === "string" || vp instanceof import_mongodb58.ObjectId ? vp : vp.keyId;
+            if (!visitorPassId)
+              value.visitorPass = [];
             await KeyRepo.updateKeyById(
               visitorPassId,
               updatePayload,
@@ -22122,6 +22127,8 @@ function useVisitorTransactionService() {
           try {
             const updatePayload = { status: "In Use" /* IN_USE */ };
             const passKeyId = typeof pk === "string" || pk instanceof import_mongodb58.ObjectId ? pk : pk.keyId;
+            if (!passKeyId)
+              value.passKeys = [];
             await KeyRepo.updateKeyById(
               passKeyId,
               updatePayload,
@@ -31076,18 +31083,16 @@ function useSiteUnitBillingRepo() {
       const endDate = new Date(dateTo);
       endDate.setHours(23, 59, 59, 999);
       dateExpr = {
-        $expr: {
-          $and: [
-            { $gte: ["$issueDate", startDate] },
-            { $lte: ["$issueDate", endDate] }
-          ]
+        issueDate: {
+          $gte: startDate,
+          $lte: endDate
         }
       };
     }
     const query = {
       status,
-      ...import_mongodb86.ObjectId.isValid(unitId) && { unitId: new import_mongodb86.ObjectId(unitId) },
-      ...import_mongodb86.ObjectId.isValid(site) && { site: new import_mongodb86.ObjectId(site) },
+      ...unitId && import_mongodb86.ObjectId.isValid(unitId) && { unitId: new import_mongodb86.ObjectId(unitId) },
+      ...site && import_mongodb86.ObjectId.isValid(site) && { site: new import_mongodb86.ObjectId(site) },
       ...dateExpr
     };
     try {
@@ -37188,16 +37193,13 @@ function useStatementOfAccountService() {
       if (user) {
         value.createdByName = user.name;
       }
-      let unit_billings = await getUnitBillingBySite(
-        {
-          status: "active",
-          site: value.site.toString() ?? "",
-          dateFrom,
-          dateTo,
-          unitId: value.unitId?.toString() ?? ""
-        },
-        session
-      );
+      let unit_billings = await getUnitBillingBySite({
+        status: "active",
+        site: value.site.toString() ?? "",
+        dateFrom,
+        dateTo,
+        unitId: value.unitId?.toString() ?? ""
+      });
       if (!unit_billings || unit_billings.length === 0) {
         return unit_billings;
       }
@@ -40701,8 +40703,7 @@ function useOccurrenceEntryService() {
     updateOccurrenceEntryById: _updateOccurrenceEntryById,
     getOccurrenceEntryById: _getOccurrenceEntryById,
     getOccurrenceEntryByBookId: _getOccurrenceEntryByBookId,
-    updateOccurrenceEntryByBookId: _updateOccurrenceEntryByBookId,
-    deleteOccurrenceEntryById: _deleteOccurrenceEntryById
+    updateOccurrenceEntryByBookId: _updateOccurrenceEntryByBookId
   } = useOccurrenceEntryRepo();
   const {
     getOccurrenceBookById: _getOccurrenceBookById,
@@ -40778,7 +40779,6 @@ function useOccurrenceEntryService() {
         totalInput: book.totalInput + 1
       });
       await _add(value);
-      await _deleteOccurrenceEntryById(id);
       await session?.commitTransaction();
       return "Successfully updated daily occurrence entry.";
     } catch (error) {