@7365admin1/core 3.34.4-staging.22 → 3.35.1-staging.23

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.35.0
+
+### Minor Changes
+
+- 6e0f967: release all changes from 07-22-26 to 07-24-26
+
 ## 3.34.3
 
 ### Patch 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>;
@@ -3132,6 +3133,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,
@@ -25511,6 +25524,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() === "") {
@@ -25916,6 +25945,7 @@ function usePersonRepo() {
     getById,
     createTextIndex,
     getPersonByPlateNumber,
+    getApprovedPersonByPlateNumber,
     getByNRIC,
     createIndexes,
     getPersonByPhoneNumber,
@@ -33887,6 +33917,7 @@ function usePersonService() {
     updateById: _updateById,
     getByUserId: _getByUserId,
     reviewResidentPerson: _reviewResidentPerson,
+    getApprovedPersonByPlateNumber,
     addFromVisitor: _addFromVisitor,
     findFirstTen
   } = usePersonRepo();
@@ -33901,7 +33932,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();
@@ -33996,7 +34027,7 @@ function usePersonService() {
             "./public/handlebars/registration-pending"
           )
         });
-        mailer.sendMail({
+        await mailer.sendMail({
           to: value.email,
           subject: "Registration Received \u2013 Pending Review",
           html: emailContent,
@@ -34156,7 +34187,7 @@ function usePersonService() {
         value.approvedBy.id = approvedBy._id;
       }
       const vehicle = {
-        plateNumber: person.plateNumber || "",
+        plateNumber: person.plateNumber ?? "",
         type: "whitelist",
         category: person.type || "",
         name: person.name,
@@ -34188,7 +34219,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;