@7365admin1/core 3.79.1-staging.347 → 3.79.1-staging.348

package/dist/index.d.ts

@@ -6626,6 +6626,7 @@ declare function usePersonRepo(): {
     updateById: (_id: string | ObjectId, value: Partial<TPerson>, session?: ClientSession) => Promise<mongodb.UpdateResult<TPerson>>;
     deleteById: (_id: string | ObjectId) => Promise<number>;
     getById: (_id: string | ObjectId) => Promise<TPerson | null>;
+    getByIdFresh: (_id: string | ObjectId) => Promise<mongodb.WithId<TPerson> | null>;
     setAcceptedTerms: (personId: string | ObjectId, termsId: string | ObjectId) => Promise<void>;
     getAcceptedTerms: (personId: string | ObjectId) => Promise<mongodb.WithId<TPerson> | null>;
     createTextIndex: () => Promise<void>;

package/dist/index.js

@@ -14520,6 +14520,14 @@ function usePersonRepo() {
       throw error;
     }
   }
+  async function getByIdFresh(_id) {
+    try {
+      _id = new import_mongodb41.ObjectId(_id);
+    } catch {
+      throw new import_node_server_utils47.BadRequestError("Invalid person ID.");
+    }
+    return collection.findOne({ _id });
+  }
   async function getById(_id) {
     try {
       _id = new import_mongodb41.ObjectId(_id);
@@ -15253,6 +15261,7 @@ function usePersonRepo() {
     updateById,
     deleteById,
     getById,
+    getByIdFresh,
     setAcceptedTerms,
     getAcceptedTerms,
     createTextIndex,
@@ -44094,15 +44103,18 @@ function holdsUnitOwner(person) {
   }
   return person.isOwner === true;
 }
-function conflictingUnitOwner(peopleAtUnit, selfId) {
+function currentUnitOwner(peopleAtUnit, selfId) {
   const self = selfId ? String(selfId) : "";
   return (peopleAtUnit ?? []).find(
     (person) => holdsUnitOwner(person) && person?.status !== "deleted" /* DELETED */ && String(person?._id ?? "") !== self
   );
 }
-function unitOwnerTakenMessage(name) {
-  const who = name?.trim() ? `"${name.trim()}"` : "Someone";
-  return `${who} is already the owner of this unit. A unit can have only one owner - assign them another role first.`;
+function mustHandOverBeforeDeactivating(person) {
+  return person?.occupancyRole === "owner" /* OWNER */;
+}
+function ownerHandoverRequiredMessage(name) {
+  const who = name?.trim() ? `"${name.trim()}"` : "This person";
+  return `${who} is the owner of this unit. Assign the owner role to another tenant at the same block, level and unit before deactivating them.`;
 }
 
 // src/services/person.service.ts
@@ -44537,17 +44549,21 @@ function usePersonService() {
     }
     return userId.toString();
   }
-  async function assertUnitOwnerFree(role, unit, session, selfId) {
+  async function handOverUnitOwner(role, unit, session, selfId) {
     if (role !== "owner" /* OWNER */ || !unit)
       return;
     const peopleAtUnit = await _getPeopleByUnit(
       { status: "active", unit: unit.toString() },
       session
     );
-    const taken = conflictingUnitOwner(peopleAtUnit, selfId);
-    if (taken) {
-      throw new import_node_server_utils140.BadRequestError(unitOwnerTakenMessage(taken.name));
-    }
+    const incumbent = currentUnitOwner(peopleAtUnit, selfId);
+    if (!incumbent?._id)
+      return;
+    await _updateById(
+      incumbent._id,
+      { occupancyRole: "occupant" /* OCCUPANT */, isOwner: false },
+      session
+    );
   }
   async function add(value) {
     const session = import_node_server_utils140.useAtlas.getClient()?.startSession();
@@ -44556,7 +44572,7 @@ function usePersonService() {
     }
     try {
       session.startTransaction();
-      await assertUnitOwnerFree(
+      await handOverUnitOwner(
         value.occupancyRole,
         value.unit,
         session
@@ -44634,7 +44650,7 @@ function usePersonService() {
       if (value.status === "active" /* ACTIVE */) {
         value.deletedAt = "";
       }
-      await assertUnitOwnerFree(
+      await handOverUnitOwner(
         value.occupancyRole,
         value.unit ?? person.unit,
         session,
@@ -59653,7 +59669,8 @@ function usePersonController() {
     getPeopleByPlateNumber: _getPeopleByPlateNumber,
     getPeopleByNRIC: _getPeopleByNRIC,
     getByUserId: _getByUserId,
-    getById: _getById
+    getById: _getById,
+    getByIdFresh: _getByIdFresh
   } = usePersonRepo();
   const {
     add: _add,
@@ -59911,6 +59928,11 @@ function usePersonController() {
     }
     try {
       await entitlePerson(req, _id);
+      const person = await _getByIdFresh(_id);
+      if (mustHandOverBeforeDeactivating(person)) {
+        next(new import_node_server_utils151.BadRequestError(ownerHandoverRequiredMessage(person?.name)));
+        return;
+      }
       await _deleteById(_id);
       res.status(200).json({ message: "Successfully deleted visitor guest." });
       return;