@7365admin1/core 3.52.3-staging.242 → 3.52.3-staging.243

package/.changeset/plates-hidden-on-all-person-reads.md

@@ -0,0 +1,16 @@
+---
+"@7365admin1/core": patch
+---
+
+Hide deleted plates on every person read, not only on the two browse paths.
+
+A vehicle's plate number is copied onto the resident's record as `site.people.plates[]`. Deleting the vehicle is meant to take it back out, and where that copy had already drifted the read paths filter it against the vehicle record. That filter was only on `GET /api/people` and `GET /api/people/unit/:unit`, so four other endpoints still handed back a plate whose only vehicle is deleted:
+
+- `GET /api/people/plateNumber/:plateNumber`
+- `GET /api/people/nric/:nric` (the MA app's NRIC lookup, and layer-common's `findPersonByNRIC`)
+- `GET /api/people/contact/:contact`
+- `GET /api/people/all-nric` (the MA app's NRIC search)
+
+Each of the four now applies the same filter. `status: { $ne: "deleted" }` on three of those queries is the PERSON's status and has nothing to do with the vehicle — reading it as "deleted plates are excluded" is how they were missed. The filter runs on the way out, after the Redis read, so a plate deleted inside the 15-minute cache window disappears immediately rather than at the next expiry.
+
+Unchanged: a plate the resident merely declared, with no vehicle record at all, is still listed; a plate a second live vehicle still holds is still listed.

package/dist/index.d.ts

@@ -5056,7 +5056,13 @@ declare function usePersonRepo(): {
         nric?: string | undefined;
         sort?: Record<string, any> | undefined;
         site: string;
-    }) => Promise<{}>;
+    }) => Promise<{
+        items: any[];
+        pages: number;
+        pageRange: string;
+    } | {
+        items: TPerson[];
+    }>;
     pushVehicleById: (id: string | ObjectId, plate: {
         plateNumber: string;
         recNo: string;

package/dist/index.js

@@ -17606,6 +17606,12 @@ function usePersonRepo() {
       return plates.length === person.plates.length ? person : { ...person, plates };
     });
   }
+  async function withoutDeletedPlatesOne(person) {
+    if (!person)
+      return person;
+    const [clean] = await withoutDeletedPlates([person]);
+    return clean ?? person;
+  }
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -17907,7 +17913,7 @@ function usePersonRepo() {
       const cacheData = await getCache(cacheKey);
       if (cacheData) {
         import_node_server_utils41.logger.info(`Cache hit for key: ${cacheKey}`);
-        return cacheData;
+        return await withoutDeletedPlatesOne(cacheData);
       }
       const data = await collection.findOne(
         { "plates.plateNumber": plateNumber, status: { $ne: "deleted" } },
@@ -17918,7 +17924,7 @@ function usePersonRepo() {
       }).catch((err) => {
         import_node_server_utils41.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
-      return data;
+      return await withoutDeletedPlatesOne(data);
     } catch (error) {
       throw new import_node_server_utils41.InternalServerError(
         "Failed to fetch individual by plate number."
@@ -17953,7 +17959,7 @@ function usePersonRepo() {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         import_node_server_utils41.logger.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
+        return await withoutDeletedPlatesOne(cachedData);
       }
       const data = await collection.findOne({ nric: value });
       setCache(cacheKey, data, 15 * 60).then(() => {
@@ -17961,7 +17967,7 @@ function usePersonRepo() {
       }).catch((err) => {
         import_node_server_utils41.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
-      return data;
+      return await withoutDeletedPlatesOne(data);
     } catch (error) {
       throw new import_node_server_utils41.InternalServerError("Failed to retrieve person by NRIC.");
     }
@@ -17974,7 +17980,7 @@ function usePersonRepo() {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         import_node_server_utils41.logger.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
+        return await withoutDeletedPlatesOne(cachedData);
       }
       const data = await collection.findOne({ contact: value });
       setCache(cacheKey, data, 15 * 60).then(() => {
@@ -17982,7 +17988,7 @@ function usePersonRepo() {
       }).catch((err) => {
         import_node_server_utils41.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
-      return data;
+      return await withoutDeletedPlatesOne(data);
     } catch (error) {
       throw new import_node_server_utils41.InternalServerError(
         "Failed to retrieve person by Phone Number."
@@ -18175,11 +18181,20 @@ function usePersonRepo() {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         import_node_server_utils41.logger.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
+        const cachedPage = cachedData;
+        return {
+          ...cachedPage,
+          items: await withoutDeletedPlates(cachedPage.items ?? [])
+        };
       }
       const items = await collection.find(query2).sort(sort).skip(page * limit).limit(limit).toArray();
       const length = await collection.countDocuments(query2);
-      const data = (0, import_node_server_utils41.paginate)(items, page, limit, length);
+      const data = (0, import_node_server_utils41.paginate)(
+        await withoutDeletedPlates(items),
+        page,
+        limit,
+        length
+      );
       setCache(cacheKey, data, 15 * 60).then(() => {
         import_node_server_utils41.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {