@7365admin1/core 3.47.1-staging.141 → 3.47.1-staging.142

package/.changeset/person-search-filter-collision.md

@@ -0,0 +1,26 @@
+---
+"@7365admin1/core": patch
+---
+
+Make the people search filters narrow each other instead of overwriting each
+other.
+
+`person.repo.getAll` built its Mongo filter as one object literal in which four
+different filters each wrote a `$or` key — the date range (`dateTo`), the
+free-text `search`, `contact` and `plateNumber`. An object literal can only
+carry one `$or`, so the last one written silently replaced every earlier one.
+In practice:
+
+- searching by name **and** contact number searched only the contact number,
+- searching by name **and** plate number searched only the plate number,
+- and a **date range was dropped entirely** the moment any of the three was
+  used — which is the live case, because `layer-common`
+  `composables/usePeople.ts:2-30` sends `search`, `dateFrom` and `dateTo`
+  together from the visitor/people list.
+
+No error was raised; the endpoint simply answered a narrower question than it
+was asked, with rows that should not have matched.
+
+The four groups are now collected and combined with `$and`, so each one narrows
+the result. A single filter behaves exactly as before, and a request with no
+filters is unchanged.

package/dist/index.js

@@ -17370,46 +17370,47 @@ function usePersonRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     const start = dateFrom ? { $gte: new Date(dateFrom).toISOString() } : void 0;
-    const end = dateTo ? {
-      $or: [
+    const anyOf = [];
+    if (dateTo) {
+      anyOf.push([
         { end: { $lte: new Date(dateTo).toISOString() } },
         { end: null }
-      ]
-    } : void 0;
+      ]);
+    }
+    if (search) {
+      anyOf.push([
+        { name: { $regex: search, $options: "i" } },
+        { email: { $regex: search, $options: "i" } },
+        { nric: { $regex: search, $options: "i" } },
+        { "plates.plateNumber": { $regex: search, $options: "i" } },
+        { contact: { $regex: makeContainsRegex(search) } },
+        { contacts: { $regex: makeContainsRegex(search) } },
+        { plateNumbers: { $regex: makeContainsRegex(search) } }
+      ]);
+    }
+    if (contact) {
+      anyOf.push([
+        { contact: { $regex: makeContainsRegex(contact) } },
+        { contacts: { $regex: makeContainsRegex(contact) } }
+      ]);
+    }
+    if (plateNumber) {
+      anyOf.push([
+        { "plates.plateNumber": { $regex: makeContainsRegex(plateNumber) } },
+        { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
+      ]);
+    }
     const query2 = {
       ...status && status !== "all" ? { status } : { status: { $nin: ["deleted", "rejected"] } },
       ...start && { start },
-      ...end,
-      ...search && {
-        $or: [
-          { name: { $regex: search, $options: "i" } },
-          { email: { $regex: search, $options: "i" } },
-          { nric: { $regex: search, $options: "i" } },
-          { "plates.plateNumber": { $regex: search, $options: "i" } },
-          { contact: { $regex: makeContainsRegex(search) } },
-          { contacts: { $regex: makeContainsRegex(search) } },
-          { plateNumbers: { $regex: makeContainsRegex(search) } }
-        ]
-      },
+      ...anyOf.length > 0 && { $and: anyOf.map(($or) => ({ $or })) },
       ...import_mongodb36.ObjectId.isValid(org) && { org: new import_mongodb36.ObjectId(org) },
       ...!import_mongodb36.ObjectId.isValid(org) && orgs && {
         org: { $in: orgs.filter(import_mongodb36.ObjectId.isValid).map((o) => new import_mongodb36.ObjectId(o)) }
       },
       ...import_mongodb36.ObjectId.isValid(site) && { site: new import_mongodb36.ObjectId(site) },
       ...PERSON_TYPES.includes(type) && { type },
-      ...nric && { nric: { $regex: makeContainsRegex(nric), $options: "i" } },
-      ...contact && {
-        $or: [
-          { contact: { $regex: makeContainsRegex(contact) } },
-          { contacts: { $regex: makeContainsRegex(contact) } }
-        ]
-      },
-      ...plateNumber && {
-        $or: [
-          { "plates.plateNumber": { $regex: makeContainsRegex(plateNumber) } },
-          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
-        ]
-      }
+      ...nric && { nric: { $regex: makeContainsRegex(nric), $options: "i" } }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {