@7365admin1/core 3.35.0 → 3.36.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.36.0
+
+### Minor Changes
+
+- f245a39: release changes in people api, etc.
+
 ## 3.35.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2498,6 +2498,7 @@ declare function useSiteCameraRepo(): {
         category?: string;
         direction?: string;
     }) => Promise<{}>;
+    getCamerasBySiteId: (site: string | ObjectId) => Promise<Array<TSiteCamera>>;
     delCachedData: () => void;
     getBySiteGuardPost: (site: string | ObjectId, guardPost: number) => Promise<{} | null>;
     updateById: (_id: string | ObjectId, value: Partial<Pick<TSiteCamera, "host" | "username" | "password" | "category" | "guardPost" | "updatedAt">>, session?: ClientSession) => Promise<string>;
@@ -3099,6 +3100,7 @@ declare function usePersonRepo(): {
     getById: (_id: string | ObjectId) => Promise<TPerson | null>;
     createTextIndex: () => Promise<void>;
     getPersonByPlateNumber: (plateNumber: string) => Promise<TPerson | null>;
+    getApprovedPersonByPlateNumber: (plateNumber: string, excludePersonId?: string | ObjectId) => Promise<TPerson | null>;
     getByNRIC: (value: string) => Promise<TPerson | null>;
     createIndexes: () => Promise<void>;
     getPersonByPhoneNumber: (value: string) => Promise<TPerson | null>;

package/dist/index.js

@@ -24812,6 +24812,18 @@ function useSiteCameraRepo() {
       throw new import_node_server_utils73.BadRequestError("Failed to retrieve site cameras.");
     }
   }
+  async function getCamerasBySiteId(site) {
+    const _site = (0, import_node_server_utils73.toObjectId)(site);
+    try {
+      const items = await collection.find({ site: _site, status: "active", type: "anpr" }).toArray();
+      return items;
+    } catch (error) {
+      if (error instanceof import_node_server_utils73.BadRequestError) {
+        throw error;
+      }
+      throw new import_node_server_utils73.BadRequestError("Failed to retrieve site cameras.");
+    }
+  }
   async function getBySiteGuardPost(site, guardPost) {
     try {
       site = new import_mongodb44.ObjectId(site);
@@ -25168,6 +25180,7 @@ function useSiteCameraRepo() {
     getBySite,
     getVisitorsInBySite,
     getBySites,
+    getCamerasBySiteId,
     delCachedData,
     getBySiteGuardPost,
     updateById,
@@ -25479,6 +25492,22 @@ function usePersonRepo() {
       );
     }
   }
+  async function getApprovedPersonByPlateNumber(plateNumber, excludePersonId) {
+    try {
+      const query = {
+        plateNumber,
+        status: "approved"
+      };
+      if (excludePersonId) {
+        query._id = { $ne: (0, import_node_server_utils74.toObjectId)(excludePersonId) };
+      }
+      return await collection.findOne(query);
+    } catch (error) {
+      throw new import_node_server_utils74.InternalServerError(
+        "Failed to fetch approved person by plate number."
+      );
+    }
+  }
   async function getByNRIC(value) {
     try {
       if (!value || value.trim() === "") {
@@ -25859,6 +25888,7 @@ function usePersonRepo() {
     getById,
     createTextIndex,
     getPersonByPlateNumber,
+    getApprovedPersonByPlateNumber,
     getByNRIC,
     createIndexes,
     getPersonByPhoneNumber,
@@ -27033,7 +27063,8 @@ function useVehicleService() {
         throw new Error("Unable to start session for vehicle service.");
       }
     }
-    const [_vehiclePlateNumber] = value.plateNumber;
+    const plateNumbers = Array.isArray(value.plateNumber) ? value.plateNumber : value.plateNumber ? [value.plateNumber] : [];
+    const [_vehiclePlateNumber] = plateNumbers;
     const [existingPlateNumber, org] = await Promise.all([
       _getVehicleByPlateNumber(_vehiclePlateNumber),
       _getById(value.org)
@@ -27098,7 +27129,6 @@ function useVehicleService() {
       }
     }
     const owner = value.name;
-    const plateNumbers = value.plateNumber;
     try {
       if (!isExternalSession) {
         session.startTransaction();
@@ -27315,7 +27345,10 @@ function useVehicleService() {
         const dahuaResponse = await _addPlateNumber(dahuaPayload);
         if (dahuaResponse?.statusCode != 200) {
           console.log("dahuaResponse", dahuaResponse);
-          console.log("approveVehicleById dahuaResponse dahuaResponse?.statusCode != 200", dahuaResponse?.statusCode);
+          console.log(
+            "approveVehicleById dahuaResponse dahuaResponse?.statusCode != 200",
+            dahuaResponse?.statusCode
+          );
           throw new import_node_server_utils78.BadRequestError("Failed to add plate number to ANPR");
         }
         const responseData = dahuaResponse?.data.toString("utf-8");
@@ -27522,7 +27555,19 @@ function useVehicleService() {
       if (value.peopleId) {
         value.peopleId = new import_mongodb49.ObjectId(value.peopleId);
       }
-      const { name, plateNumber, start, end, recNo, type, unit, site, block, level, ...rest } = value;
+      const {
+        name,
+        plateNumber,
+        start,
+        end,
+        recNo,
+        type,
+        unit,
+        site,
+        block,
+        level,
+        ...rest
+      } = value;
       if (_name != name || _plateNumber != plateNumber) {
         const startDahua = value.start ? formatDahuaDate(new Date(value.start)) : formatDahuaDate(new Date(_start));
         const endDahua = value.end ? formatDahuaDate(new Date(value.end)) : formatDahuaDate(new Date(_end));
@@ -27549,7 +27594,11 @@ function useVehicleService() {
           for (const camera of siteCameras) {
             const { host, username, password } = camera;
             if (_plateNumber != plateNumber) {
-              console.log("updateVehicleById _plateNumber != plateNumber", _plateNumber, plateNumber);
+              console.log(
+                "updateVehicleById _plateNumber != plateNumber",
+                _plateNumber,
+                plateNumber
+              );
               const removePlateNumber = {
                 host,
                 username,
@@ -27596,7 +27645,11 @@ function useVehicleService() {
                 );
               }
             } else {
-              console.log("updateVehicleById _plateNumber == plateNumber", _plateNumber, plateNumber);
+              console.log(
+                "updateVehicleById _plateNumber == plateNumber",
+                _plateNumber,
+                plateNumber
+              );
               const dahuaPayload = {
                 host,
                 username,
@@ -36390,7 +36443,8 @@ function usePersonService() {
     getById: _getById,
     updateById: _updateById,
     getByUserId: _getByUserId,
-    reviewResidentPerson: _reviewResidentPerson
+    reviewResidentPerson: _reviewResidentPerson,
+    getApprovedPersonByPlateNumber
   } = usePersonRepo();
   const { addPlateNumber: _addPlateNumber } = useDahuaService();
   const {
@@ -36403,7 +36457,7 @@ function usePersonService() {
   } = useUserRepo();
   const { add: addMember } = useMemberRepo();
   const { getById: _getUnitById, updateById: updateUnitById } = useBuildingUnitRepo();
-  const { getAllCameraWithPassword: _getAllSiteCameras } = useSiteCameraRepo();
+  const { getAllCameraWithPassword: _getAllSiteCameras, getCamerasBySiteId } = useSiteCameraRepo();
   const { updateStatusById } = useFileRepo();
   const { getById: getOrgById } = useOrgRepo();
   const { getSiteById } = useSiteRepo();
@@ -36498,7 +36552,7 @@ function usePersonService() {
             "./public/handlebars/registration-pending"
           )
         });
-        mailer.sendMail({
+        await mailer.sendMail({
           to: value.email,
           subject: "Registration Received \u2013 Pending Review",
           html: emailContent,
@@ -36658,7 +36712,7 @@ function usePersonService() {
         value.approvedBy.id = approvedBy._id;
       }
       const vehicle = {
-        plateNumber: person.plateNumber || "",
+        plateNumber: person.plateNumber ?? "",
         type: "whitelist",
         category: person.type || "",
         name: person.name,
@@ -36690,7 +36744,16 @@ function usePersonService() {
           case "approved":
             userStatus = "active";
             if (person.plateNumber && person.plateNumber.trim() !== "") {
-              await addVehicle(vehicle, session);
+              const anprCameraList = await getCamerasBySiteId(
+                person.site.toString()
+              );
+              const existingPerson = await getApprovedPersonByPlateNumber(
+                person.plateNumber,
+                id
+              );
+              if (anprCameraList.length > 0 && !existingPerson) {
+                await addVehicle(vehicle, session);
+              }
             }
             title = "Your account has been approved";
             hideLogin = false;