@7365admin1/core 3.52.2-staging.238 → 3.52.2-staging.239

package/.changeset/vehicle-deleted-plates-and-alert-pacing.md

@@ -0,0 +1,10 @@
+---
+"@7365admin1/core": patch
+---
+
+Vehicle management: a deleted plate is gone from every list, a plate with no camera record can be deleted, and a camera blip no longer raises an alarm
+
+- Deleting a vehicle is a soft delete, and no read path filtered on it — so the row never disappeared from the vehicle list, still sat on the blocklist (still stopping the car at the barrier), still filled the by-unit lookup, the season-pass options and the row counts, and still blocked re-creating that plate number. `getVehicles`, `getBlocklistedVehicles`, `getBlocklistedVehicleByPlateNumber`, `getAllVehiclesByUnitId` and `getSeasonPassTypes` now exclude deleted records, and `getVehicleById` drops deleted sibling plates. An explicit `status=deleted` is still honoured, which is the only way to look at them.
+- Creating a vehicle no longer refuses a plate number that only exists on a deleted record. A live duplicate is still refused.
+- The two database writes at the end of a delete ran together on one session inside one transaction; they now run in order. The person-side failure no longer reports itself as an NRIC problem and logs its real cause.
+- An ANPR camera alert now waits for the third consecutive failed reconnect instead of the first. Writing a plate to a camera drops that camera's own event stream while the device services the write, so a successful "add vehicle" raised "the camera is not responding — ask your site technician" at the exact moment it succeeded.

package/dist/index.js

@@ -18228,7 +18228,13 @@ function usePersonRepo() {
         { session }
       );
     } catch (error) {
-      throw new import_node_server_utils41.InternalServerError("Failed to pull vehicle plates by nric.");
+      import_node_server_utils41.logger.log({
+        level: "error",
+        message: `pullVehicleByRecNo failed on ${matchKey} for ${owner ? "person" : "site"} ${String(owner ?? site)}: ${error?.message ?? error}`
+      });
+      throw new import_node_server_utils41.InternalServerError(
+        "Could not take the plate off the resident's record."
+      );
     }
   }
   async function getByUserId(userId) {
@@ -21273,6 +21279,7 @@ function useVehicleRepo() {
     throw new import_node_server_utils50.InternalServerError("Unable to connect to server.");
   }
   const collection = db2.collection(vehicles_namespace_collection);
+  const NOT_DELETED = { status: { $ne: "deleted" /* DELETED */ } };
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -21329,7 +21336,10 @@ function useVehicleRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     const baseQuery = {
-      ...status && { status },
+      // An explicit `status` is still honoured as it was - including
+      // `status=deleted`, which is the only way to see deleted plates and is
+      // what an audit view would ask for.
+      ...status ? { status } : NOT_DELETED,
       ...type && { type },
       ...category && { category },
       ...site && { site: new import_mongodb42.ObjectId(site) }
@@ -21540,7 +21550,7 @@ function useVehicleRepo() {
     }
     try {
       const categories = await collection.aggregate([
-        { $match: { site } },
+        { $match: { site, ...NOT_DELETED } },
         {
           $group: {
             _id: "$seasonPassType",
@@ -21715,7 +21725,19 @@ function useVehicleRepo() {
                       cond: {
                         $and: [
                           { $ne: ["$$plate.plateNumber", null] },
-                          { $ne: ["$$plate.plateNumber", ""] }
+                          { $ne: ["$$plate.plateNumber", ""] },
+                          // The plate that was ASKED for is always returned,
+                          // deleted or not - Restore, Approve and Blocklist
+                          // all read the record by its own id. Its deleted
+                          // SIBLINGS are dropped, so the Preview dialog of a
+                          // live resident stops offering actions on plates
+                          // that have been deleted.
+                          {
+                            $or: [
+                              { $eq: ["$$plate._id", "$$vehicleId"] },
+                              { $ne: ["$$plate.status", "deleted"] }
+                            ]
+                          }
                         ]
                       }
                     }
@@ -21983,7 +22005,8 @@ function useVehicleRepo() {
     try {
       const unit = (0, import_node_server_utils50.toObjectId)(unitId);
       const query2 = {
-        unit
+        unit,
+        ...NOT_DELETED
       };
       const items = await collection.find(query2, {
         projection: {
@@ -22084,6 +22107,7 @@ function useVehicleRepo() {
     page = page > 0 ? page - 1 : 0;
     const baseQuery = {
       type: "blocklist" /* BLOCKLIST */,
+      ...NOT_DELETED,
       ...site && {
         site: typeof site === "string" ? new import_mongodb42.ObjectId(site) : site
       }
@@ -22150,6 +22174,8 @@ function useVehicleRepo() {
     const baseQuery = {
       type: "blocklist" /* BLOCKLIST */,
       plateNumber,
+      // A blocklist entry that was deleted must stop blocking the car.
+      ...NOT_DELETED,
       ...site && {
         site: typeof site === "string" ? new import_mongodb42.ObjectId(site) : site
       }
@@ -22360,7 +22386,7 @@ function cameraCredentialsMessage(camera) {
 function cameraNotAuthorisedMessage(camera) {
   return `${describeCamera(camera)} rejected our connection, so it cannot read plates. This usually means its account is not allowed to use the plate-reading feed. Please ask your site technician or the security-system installer to check the camera's account permissions.`;
 }
-var CAMERA_ALERT_AT_ATTEMPT = [1, 6, 30, 90];
+var CAMERA_ALERT_AT_ATTEMPT = [3, 6, 30, 90];
 var CAMERA_ALERT_EVERY_AFTER = 90;
 function shouldAlertOnFailure(consecutiveFailures) {
   if (!Number.isInteger(consecutiveFailures) || consecutiveFailures < 1)
@@ -35298,7 +35324,11 @@ function useVehicleService() {
         };
         if (vehicleValue.status && vehicleValue.status !== "pending" /* PENDING */) {
           const siteObjectId = new import_mongodb67.ObjectId(vehicleValue.site);
-          const existingPlateNumber = await findOne({ plateNumber, site: siteObjectId });
+          const existingPlateNumber = await findOne({
+            plateNumber,
+            site: siteObjectId,
+            status: { $ne: "deleted" /* DELETED */ }
+          });
           if (existingPlateNumber) {
             throw new import_node_server_utils99.BadRequestError(`Vehicle plate number ${plateNumber} already exists.`);
           }
@@ -35472,17 +35502,12 @@ function useVehicleService() {
           throw new import_node_server_utils99.BadRequestError(message);
         import_node_server_utils99.logger.warn(`deleteVehicle bypassed a failed ANPR revoke: ${message}`);
       }
-      await Promise.all([
-        _deleteVehicle(_id, session),
-        // `plateNumber` is the fallback key. Pulling on an EMPTY `recNo` would
-        // match every other unregistered plate on the same person or site -
-        // five vehicles share the blank value on staging today.
-        _pullVehicleByRecNo(
-          recno,
-          { peopleId: vehicle?.peopleId, site, plateNumber },
-          session
-        )
-      ]);
+      await _deleteVehicle(_id, session);
+      await _pullVehicleByRecNo(
+        recno,
+        { peopleId: vehicle?.peopleId, site, plateNumber },
+        session
+      );
       await session.commitTransaction();
       return `Vehicle plate number deleted from ${type} record successfully.`;
     } catch (error) {