@7365admin1/core 3.48.1-staging.182 → 3.48.1-staging.184

package/dist/index.js

@@ -29881,7 +29881,7 @@ function useSubscriptionService() {
       }
       const items = [];
       const dueInvoice = await getByDueDate(
-        subscription.nextBillingDate,
+        new Date(subscription.nextBillingDate),
         "pending"
       );
       if (value.promoCode) {
@@ -30022,7 +30022,13 @@ function useSubscriptionService() {
         {
           _id: value.subscriptionId,
           currentSeats: value.seats,
-          maxSeats: 0,
+          // Keep the organisation's own seat limit. It is worked out above —
+          // the current limit, raised when the new seat count is larger — and
+          // was then thrown away here in favour of a literal 0. Now that 0
+          // means UNLIMITED, writing it handed the organisation an uncapped
+          // subscription on every seat change. A plan that really is unlimited
+          // is already 0 above, so it still passes through untouched.
+          maxSeats,
           paidSeats: paidSeats > value.seats ? paidSeats : value.seats,
           promoCode: value.promoCode ?? "",
           amount: value.seats * Number(newMonthlySubscriptionPrice.toFixed(2))
@@ -33693,7 +33699,7 @@ function useBuildingUnitRepo() {
       ...site && { site: (0, import_node_server_utils97.toObjectId)(site) },
       ...building && { building: (0, import_node_server_utils97.toObjectId)(building) }
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    sort = Object.keys(sort).length > 0 ? sort : { block: 1, "level.name": 1, name: 1, _id: 1 };
     const cacheParams = {
       page,
       limit,
@@ -33757,38 +33763,44 @@ function useBuildingUnitRepo() {
           }
         ] : []
       ];
-      const items = await collection.aggregate([
-        ...pipeline,
-        {
-          $lookup: {
-            from: "sites",
-            let: { siteId: "$site" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$_id", "$$siteId"] },
-                  status: "active" /* ACTIVE */
-                }
-              },
-              {
-                $project: {
-                  name: 1,
-                  description: 1,
-                  orgId: 1,
-                  metadata: 1,
-                  status: 1,
-                  address: 1
+      const items = await collection.aggregate(
+        [
+          ...pipeline,
+          {
+            $lookup: {
+              from: "sites",
+              let: { siteId: "$site" },
+              pipeline: [
+                {
+                  $match: {
+                    $expr: { $eq: ["$_id", "$$siteId"] },
+                    status: "active" /* ACTIVE */
+                  }
+                },
+                {
+                  $project: {
+                    name: 1,
+                    description: 1,
+                    orgId: 1,
+                    metadata: 1,
+                    status: 1,
+                    address: 1
+                  }
                 }
-              }
-            ],
-            as: "site"
-          }
-        },
-        { $set: { site: { $first: "$site" } } },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
+              ],
+              as: "site"
+            }
+          },
+          { $set: { site: { $first: "$site" } } },
+          { $sort: sort },
+          { $skip: page * limit },
+          { $limit: limit }
+        ],
+        // Sort units by block, then level name (natural: Lvl 2 before Lvl 10),
+        // then unit name. Skip collation when a search regex is active (Mongo
+        // rejects $regex + non-simple collation); browse view is what needs it.
+        searchText ? {} : { collation: { locale: "en", numericOrdering: true } }
+      ).toArray();
       const total = await collection.aggregate([...pipeline, { $count: "length" }]).toArray();
       const length = total[0]?.length ?? 0;
       const data = (0, import_node_server_utils97.paginate)(items, page, limit, length);
@@ -33827,7 +33839,7 @@ function useBuildingUnitRepo() {
       ...building && { building: (0, import_node_server_utils97.toObjectId)(building) },
       ...level && { level: (0, import_node_server_utils97.toObjectId)(level) }
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    sort = Object.keys(sort).length > 0 ? sort : { block: 1, "level.name": 1, name: 1, _id: 1 };
     const cacheParams = {
       page,
       limit,
@@ -33855,35 +33867,40 @@ function useBuildingUnitRepo() {
         });
         return cached;
       }
-      const items = await collection.aggregate([
-        { $match: query2 },
-        {
-          $project: {
-            site: 1,
-            name: 1,
-            building: 1,
-            buildingName: 1,
-            block: 1,
-            level: 1,
-            unitNumber: 1,
-            createdAt: 1,
-            updatedAt: 1
-          }
-        },
-        {
-          $lookup: {
-            from: "building-levels",
-            localField: "level",
-            foreignField: "_id",
-            pipeline: [{ $project: { name: 1 } }],
-            as: "level"
-          }
-        },
-        { $set: { level: { $first: "$level" } } },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
+      const items = await collection.aggregate(
+        [
+          { $match: query2 },
+          {
+            $project: {
+              site: 1,
+              name: 1,
+              building: 1,
+              buildingName: 1,
+              block: 1,
+              level: 1,
+              unitNumber: 1,
+              createdAt: 1,
+              updatedAt: 1
+            }
+          },
+          {
+            $lookup: {
+              from: "building-levels",
+              localField: "level",
+              foreignField: "_id",
+              pipeline: [{ $project: { name: 1 } }],
+              as: "level"
+            }
+          },
+          { $set: { level: { $first: "$level" } } },
+          { $sort: sort },
+          { $skip: page * limit },
+          { $limit: limit }
+        ],
+        // Natural sort by block, level name, unit name. Skip collation when a
+        // $text search is active (Mongo rejects the combo); browse view needs it.
+        search ? {} : { collation: { locale: "en", numericOrdering: true } }
+      ).toArray();
       const length = await collection.countDocuments(query2);
       const data = (0, import_node_server_utils97.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
@@ -36064,7 +36081,7 @@ function useBuildingRepo() {
         ]
       }
     };
-    sort = Object.keys(sort).length ? sort : { _id: -1 };
+    sort = Object.keys(sort).length ? sort : { name: 1, _id: 1 };
     const cacheParams = {
       page,
       limit,
@@ -36087,36 +36104,44 @@ function useBuildingRepo() {
         });
         return cached;
       }
-      const items = await collection.aggregate([
-        { $match: query2 },
-        {
-          $lookup: {
-            from: "building-levels",
-            let: {
-              buildingId: "$_id",
-              buildingLevelIds: { $ifNull: ["$levels", []] }
-            },
-            pipeline: [
-              {
-                $match: {
-                  status: "active" /* ACTIVE */,
-                  $expr: {
-                    $or: [
-                      { $in: ["$_id", "$$buildingLevelIds"] },
-                      { $eq: ["$blockId", "$$buildingId"] }
-                    ]
-                  }
-                }
+      const items = await collection.aggregate(
+        [
+          { $match: query2 },
+          {
+            $lookup: {
+              from: "building-levels",
+              let: {
+                buildingId: "$_id",
+                buildingLevelIds: { $ifNull: ["$levels", []] }
               },
-              { $project: { _id: 1, name: 1 } }
-            ],
-            as: "levels"
-          }
-        },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
+              pipeline: [
+                {
+                  $match: {
+                    status: "active" /* ACTIVE */,
+                    $expr: {
+                      $or: [
+                        { $in: ["$_id", "$$buildingLevelIds"] },
+                        { $eq: ["$blockId", "$$buildingId"] }
+                      ]
+                    }
+                  }
+                },
+                { $project: { _id: 1, name: 1 } },
+                { $sort: { name: 1 } }
+              ],
+              as: "levels"
+            }
+          },
+          { $sort: sort },
+          { $skip: page * limit },
+          { $limit: limit }
+        ],
+        // numericOrdering => natural order (Blk 2 < Blk 100 < Blk 165, and
+        // levels Lvl 2 before Lvl 10). Skip collation when a $text search is
+        // active (Mongo rejects the combo); the default browse view is what
+        // needs the natural ordering.
+        searchText ? {} : { collation: { locale: "en", numericOrdering: true } }
+      ).toArray();
       const length = await collection.countDocuments(query2);
       const data = (0, import_node_server_utils104.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
@@ -36465,18 +36490,25 @@ function useBuildingRepo() {
     const cacheOptions = { ...query2 };
     const cacheKey = (0, import_node_server_utils104.makeCacheKey)(buildings_namespace_collection, cacheOptions);
     try {
-      const result = await collection.aggregate([
-        {
-          $match: {
-            ...query2
-          }
-        },
-        {
-          $project: {
-            name: 1
-          }
-        }
-      ]).toArray();
+      const result = await collection.aggregate(
+        [
+          {
+            $match: {
+              ...query2
+            }
+          },
+          {
+            $project: {
+              name: 1
+            }
+          },
+          { $sort: { name: 1, _id: 1 } }
+        ],
+        // numericOrdering => natural order in the block dropdowns
+        // (Blk 2 < Blk 10 < Blk 165). No search branch here, so collation
+        // always applies.
+        { collation: { locale: "en", numericOrdering: true } }
+      ).toArray();
       return {
         success: true,
         message: "Buildings retrieved successfully",
@@ -36641,6 +36673,9 @@ function useBuildingLevelRepo() {
   const { delNamespace: delBuildingNamespace } = (0, import_node_server_utils107.useCache)(
     buildings_namespace_collection
   );
+  const { delNamespace: delUnitNamespace } = (0, import_node_server_utils107.useCache)(
+    building_units_namespace_collection
+  );
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -36680,6 +36715,12 @@ function useBuildingLevelRepo() {
         message: `Failed to clear buildings cache: ${err.message}`
       });
     });
+    delUnitNamespace().catch((err) => {
+      import_node_server_utils107.logger.log({
+        level: "error",
+        message: `Failed to clear building-units cache: ${err.message}`
+      });
+    });
   }
   async function add(value, session) {
     try {
@@ -36742,19 +36783,25 @@ function useBuildingLevelRepo() {
         });
         return cached;
       }
-      const sortStage = Object.keys(sort).length > 0 ? { $sort: sort } : { $sort: { latestDate: -1 } };
-      const items = await collection.aggregate([
-        { $match: query2 },
-        {
-          $addFields: {
-            latestDate: { $max: ["$updatedAt", "$createdAt"] }
-          }
-        },
-        sortStage,
-        { $unset: "latestDate" },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
+      const sortStage = Object.keys(sort).length > 0 ? { $sort: sort } : { $sort: { name: 1 } };
+      const items = await collection.aggregate(
+        [
+          { $match: query2 },
+          {
+            $addFields: {
+              latestDate: { $max: ["$updatedAt", "$createdAt"] }
+            }
+          },
+          sortStage,
+          { $unset: "latestDate" },
+          { $skip: page * limit },
+          { $limit: limit }
+        ],
+        // numericOrdering gives natural order (Lvl 2 before Lvl 10). Skip
+        // collation when a $text search is active (Mongo rejects the combo);
+        // ordering matters for the default browse list.
+        search ? {} : { collation: { locale: "en", numericOrdering: true } }
+      ).toArray();
       const length = await collection.countDocuments(query2);
       const data = (0, import_node_server_utils107.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
@@ -37027,18 +37074,22 @@ function useBuildingLevelRepo() {
       const levelIds = [
         ...new Set(levelsWithUnits.map((l) => l.level.toString()))
       ].map((id) => new import_mongodb70.ObjectId(id));
-      const result = await collection.aggregate([
-        {
-          $match: {
-            _id: { $in: levelIds }
-          }
-        },
-        {
-          $project: {
-            name: 1
-          }
-        }
-      ]).toArray();
+      const result = await collection.aggregate(
+        [
+          {
+            $match: {
+              _id: { $in: levelIds }
+            }
+          },
+          {
+            $project: {
+              name: 1
+            }
+          },
+          { $sort: { name: 1 } }
+        ],
+        { collation: { locale: "en", numericOrdering: true } }
+      ).toArray();
       return {
         success: true,
         message: "Building levels retrieved successfully",
@@ -37679,7 +37730,7 @@ function useBuildingController() {
       search: import_joi53.default.string().optional().allow("", null),
       site: import_joi53.default.string().hex().optional().allow("", null),
       status: import_joi53.default.string().valid(...Object.values(BuildingStatus)).default("active" /* ACTIVE */),
-      sort: import_joi53.default.string().valid(...Object.values(SortFields)).default("_id" /* ID */),
+      sort: import_joi53.default.string().valid(...Object.values(SortFields)).optional(),
       order: import_joi53.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */)
     });
     const { error, value } = validation.validate(query2);
@@ -37694,9 +37745,7 @@ function useBuildingController() {
     const status = value.status;
     const site = value.site ?? "";
     const search = value.search ?? "";
-    const sortObj = {
-      [sort]: order === "asc" /* ASC */ ? 1 : -1
-    };
+    const sortObj = sort ? { [sort]: order === "asc" /* ASC */ ? 1 : -1 } : {};
     try {
       const buildings = await _getAll({
         page,
@@ -38311,7 +38360,7 @@ function useBuildingUnitController() {
         site: import_joi54.default.string().hex().length(24).optional().allow("", null),
         building: import_joi54.default.string().hex().optional().allow("", null),
         status: import_joi54.default.string().valid(...Object.values(BuildingStatus)).default("active" /* ACTIVE */),
-        sort: import_joi54.default.string().valid(...Object.values(SortFields)).default("_id" /* ID */),
+        sort: import_joi54.default.string().valid(...Object.values(SortFields)).optional(),
         order: import_joi54.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */)
       });
       const query2 = {
@@ -38332,9 +38381,7 @@ function useBuildingUnitController() {
       const sort = value.sort;
       const order = value.order;
       const status = value.status;
-      const sortObj = {
-        [sort]: order === "asc" /* ASC */ ? -1 : 1
-      };
+      const sortObj = sort ? { [sort]: order === "asc" /* ASC */ ? -1 : 1 } : {};
       const site = value.site;
       const building = value.building;
       const search = value.search;
@@ -38477,7 +38524,7 @@ function useBuildingUnitController() {
         site: import_joi54.default.string().hex().length(24).optional().allow("", null),
         building: import_joi54.default.string().hex().optional().allow("", null),
         status: import_joi54.default.string().valid(...Object.values(BuildingStatus)).default("active" /* ACTIVE */),
-        sort: import_joi54.default.string().valid(...Object.values(SortFields)).default("_id" /* ID */),
+        sort: import_joi54.default.string().valid(...Object.values(SortFields)).optional(),
         order: import_joi54.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */),
         level: import_joi54.default.string().hex().length(24).optional().allow(null, "")
       });
@@ -38499,9 +38546,7 @@ function useBuildingUnitController() {
       const sort = value.sort;
       const order = value.order;
       const status = value.status;
-      const sortObj = {
-        [sort]: order === "asc" /* ASC */ ? -1 : 1
-      };
+      const sortObj = sort ? { [sort]: order === "asc" /* ASC */ ? -1 : 1 } : {};
       const site = value.site;
       const building = value.building;
       const search = value.search;