@7365admin1/core 3.2.0 → 3.4.0

package/dist/index.js

@@ -6064,6 +6064,7 @@ __export(src_exports, {
   poolDashboardCollection: () => poolDashboardCollection,
   promoCodeSchema: () => promoCodeSchema,
   remarksSchema: () => remarksSchema,
+  residentFormEntry: () => residentFormEntry,
   robotSchema: () => robotSchema,
   schema: () => schema,
   schemaApprovedBy: () => schemaApprovedBy,
@@ -9170,6 +9171,9 @@ function MMember(value) {
     siteId: import_joi7.default.string().hex().optional().allow("", null),
     siteName: import_joi7.default.string().optional().allow("", null),
     status: import_joi7.default.string().optional().allow("", null),
+    onboardingRequired: import_joi7.default.boolean().optional(),
+    onboardingCompleted: import_joi7.default.boolean().optional(),
+    onboardingCompletedAt: import_joi7.default.string().optional().allow("", null),
     createdAt: import_joi7.default.string().optional().allow("", null),
     updatedAt: import_joi7.default.string().optional().allow("", null),
     deletedAt: import_joi7.default.string().optional().allow("", null)
@@ -9217,6 +9221,9 @@ function MMember(value) {
     siteId: value.siteId ?? "",
     siteName: value.siteName ?? "",
     status: value.status || "active",
+    onboardingRequired: value.onboardingRequired ?? false,
+    onboardingCompleted: value.onboardingCompleted ?? !value.onboardingRequired,
+    onboardingCompletedAt: value.onboardingCompletedAt ?? "",
     createdAt: value.createdAt || (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: "",
     deletedAt: ""
@@ -10067,6 +10074,35 @@ function useMemberRepo() {
       );
     }
   }
+  async function completeOnboardingById(_id, session) {
+    try {
+      _id = new import_mongodb11.ObjectId(_id);
+    } catch {
+      throw new import_node_server_utils12.BadRequestError("Invalid member ID format.");
+    }
+    const result = await collection.updateOne(
+      {
+        _id,
+        onboardingRequired: true,
+        onboardingCompleted: false
+      },
+      {
+        $set: {
+          onboardingCompleted: true,
+          onboardingCompletedAt: (/* @__PURE__ */ new Date()).toISOString(),
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        }
+      },
+      { session }
+    );
+    if (!result.matchedCount) {
+      throw new import_node_server_utils12.NotFoundError(
+        "Member not found or onboarding is not required."
+      );
+    }
+    await delNamespace();
+    return "Successfully completed onboarding.";
+  }
   return {
     createIndex,
     createUniqueIndex,
@@ -10088,7 +10124,8 @@ function useMemberRepo() {
     updateRoleById,
     getByRoles,
     updateSiteById,
-    getByUserIdTypeOrg
+    getByUserIdTypeOrg,
+    completeOnboardingById
   };
 }
 
@@ -10539,9 +10576,6 @@ var orgSchema = import_joi8.default.object({
   busInst: import_joi8.default.string().optional().allow("", null),
   status: import_joi8.default.string().optional().allow("", null),
   defaultSite: import_joi8.default.string().hex().optional().allow("", null),
-  onboardingRequired: import_joi8.default.boolean().optional(),
-  onboardingCompleted: import_joi8.default.boolean().optional(),
-  onboardingCompletedAt: import_joi8.default.date().optional().allow(null),
   terms: import_joi8.default.string().optional().allow("", null),
   policies: import_joi8.default.string().optional().allow("", null),
   createdAt: import_joi8.default.string().optional().allow("", null),
@@ -10571,9 +10605,6 @@ function MOrg(value) {
     busInst: value.busInst,
     status: value.status || "active",
     defaultSite: value.defaultSite,
-    onboardingRequired: value.onboardingRequired || false,
-    onboardingCompleted: value.onboardingCompleted || false,
-    onboardingCompletedAt: value.onboardingCompletedAt || null,
     terms: value.terms ?? "",
     policies: value.policies ?? "",
     createdAt: value.createdAt || /* @__PURE__ */ new Date(),
@@ -14182,7 +14213,8 @@ function useMemberService() {
     updateRoleById: _updateRoleById,
     getByRoles,
     updateSiteById: _updateSiteById,
-    getAllByUserId: _getAllByUserId
+    getAllByUserId: _getAllByUserId,
+    completeOnboardingById: _completeOnboardingById
   } = useMemberRepo();
   const { getById: _getVerificationById, updateStatusById } = useVerificationRepo();
   const { getUserByEmail, updateDefaultOrgByEmail, getUserById } = useUserRepo();
@@ -14253,7 +14285,8 @@ function useMemberService() {
     roleId,
     app,
     siteId,
-    siteName
+    siteName,
+    onboardingRequired
   }) {
     const session = import_node_server_utils30.useAtlas.getClient()?.startSession();
     session?.startTransaction();
@@ -14273,7 +14306,10 @@ function useMemberService() {
           role: roleId,
           type: app,
           siteId: siteId ?? "",
-          siteName: siteName ?? ""
+          siteName: siteName ?? "",
+          onboardingRequired,
+          onboardingCompleted: false,
+          onboardingCompletedAt: ""
         },
         session
       );
@@ -14343,12 +14379,19 @@ function useMemberService() {
       throw error;
     }
   }
+  async function completeOnboarding(memberId) {
+    await _completeOnboardingById(memberId);
+    return {
+      message: "Member onboarding completed."
+    };
+  }
   return {
     createMember,
     createMemberDirect,
     updateRoleById,
     updateSiteById,
-    getAllByUser
+    getAllByUser,
+    completeOnboarding
   };
 }
 
@@ -14364,7 +14407,7 @@ function useMemberController() {
     updateStatusByUserId: _updateStatusByUserId,
     updateSiteById: _updateSiteById
   } = useMemberRepo();
-  const { createMember: _createMember, createMemberDirect: _createMemberDirect, updateRoleById: _updateRoleById, getAllByUser: _getAllByUser } = useMemberService();
+  const { createMember: _createMember, createMemberDirect: _createMemberDirect, updateRoleById: _updateRoleById, getAllByUser: _getAllByUser, completeOnboarding: _completeOnboarding } = useMemberService();
   async function createMember(req, res, next) {
     const validation = import_joi15.default.string().hex().required();
     const _id = req.params.id;
@@ -14588,7 +14631,8 @@ function useMemberController() {
       roleId: import_joi15.default.string().hex().required(),
       app: import_joi15.default.string().required(),
       siteId: import_joi15.default.string().hex().optional().allow("", null),
-      siteName: import_joi15.default.string().optional().allow("", null)
+      siteName: import_joi15.default.string().optional().allow("", null),
+      onboardingRequired: import_joi15.default.boolean().optional()
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -14596,9 +14640,9 @@ function useMemberController() {
       next(new import_node_server_utils31.BadRequestError(error.message));
       return;
     }
-    const { userId, orgId, roleId, app, siteId, siteName } = req.body;
+    const { userId, orgId, roleId, app, siteId, siteName, onboardingRequired } = req.body;
     try {
-      const data = await _createMemberDirect({ userId, orgId, roleId, app, siteId, siteName });
+      const data = await _createMemberDirect({ userId, orgId, roleId, app, siteId, siteName, onboardingRequired });
       res.status(201).json(data);
       return;
     } catch (error2) {
@@ -14672,6 +14716,23 @@ function useMemberController() {
       return;
     }
   }
+  async function completeOnboarding(req, res, next) {
+    const validation = import_joi15.default.object({
+      id: import_joi15.default.string().hex().required()
+    });
+    const { error } = validation.validate(req.params);
+    if (error) {
+      return next(new import_node_server_utils31.BadRequestError(error.message));
+    }
+    try {
+      const data = await _completeOnboarding(
+        req.params.id
+      );
+      res.json(data);
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     createMember,
     getByUserId,
@@ -14683,7 +14744,8 @@ function useMemberController() {
     updateRoleById,
     createMemberDirect,
     updateSiteById,
-    getByUserIdTypeOrg
+    getByUserIdTypeOrg,
+    completeOnboarding
   };
 }
 
@@ -15328,7 +15390,7 @@ function useOrgController() {
       return;
     }
     try {
-      const _id = await _add({ ...req.body, onboardingRequired: true, onboardingCompleted: false, onboardingCompletedAt: null });
+      const _id = await _add(req.body);
       const data = await _getById(_id);
       res.status(201).json({
         message: "Successfully created organization.",
@@ -15497,35 +15559,6 @@ function useOrgController() {
       next(error);
     }
   }
-  async function completeOnboarding(req, res, next) {
-    const validation = import_joi18.default.string().hex().required();
-    const id = req.params.id;
-    const { error } = validation.validate(id);
-    if (error) {
-      import_node_server_utils35.logger.log({
-        level: "error",
-        message: error.message
-      });
-      next(new import_node_server_utils35.BadRequestError(error.message));
-      return;
-    }
-    try {
-      await _completeOnboardingById(id);
-      const data = await _getById(id);
-      res.json({
-        message: "Organization onboarding completed successfully",
-        data
-      });
-      return;
-    } catch (error2) {
-      import_node_server_utils35.logger.log({
-        level: "error",
-        message: error2.message
-      });
-      next(error2);
-      return;
-    }
-  }
   return {
     add,
     addOnboardingOrg,
@@ -15536,8 +15569,7 @@ function useOrgController() {
     getByEmail,
     update,
     getOrgsByEmail,
-    getAdminOrgForResident,
-    completeOnboarding
+    getAdminOrgForResident
   };
 }
 
@@ -21517,15 +21549,9 @@ function useVisitorTransactionRepo() {
           {
             $lookup: {
               from: "buildings",
-              let: { blockId: "$block" },
-              pipeline: [
-                {
-                  $match: {
-                    $expr: { $eq: ["$_id", "$$blockId"] }
-                  }
-                },
-                { $project: { _id: 1, name: 1, block: 1 } }
-              ],
+              localField: "block",
+              foreignField: "_id",
+              pipeline: [{ $project: { name: 1, block: 1 } }],
               as: "block"
             }
           },
@@ -21533,15 +21559,9 @@ function useVisitorTransactionRepo() {
           {
             $lookup: {
               from: "building-levels",
-              let: { levelId: "$level" },
-              pipeline: [
-                {
-                  $match: {
-                    $expr: { $eq: ["$_id", "$$levelId"] }
-                  }
-                },
-                { $project: { _id: 1, name: 1 } }
-              ],
+              localField: "level",
+              foreignField: "_id",
+              pipeline: [{ $project: { name: 1 } }],
               as: "level"
             }
           },
@@ -21549,15 +21569,9 @@ function useVisitorTransactionRepo() {
           {
             $lookup: {
               from: "building-units",
-              let: { unitId: "$unit" },
-              pipeline: [
-                {
-                  $match: {
-                    $expr: { $eq: ["$_id", "$$unitId"] }
-                  }
-                },
-                { $project: { _id: 1, name: 1 } }
-              ],
+              localField: "unit",
+              foreignField: "_id",
+              pipeline: [{ $project: { name: 1 } }],
               as: "unit"
             }
           },
@@ -21611,15 +21625,9 @@ function useVisitorTransactionRepo() {
         {
           $lookup: {
             from: "buildings",
-            let: { blockId: "$block" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1, block: 1 } }
-            ],
+            localField: "block",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1, block: 1 } }],
             as: "block"
           }
         },
@@ -21627,15 +21635,9 @@ function useVisitorTransactionRepo() {
         {
           $lookup: {
             from: "building-levels",
-            let: { levelId: "$level" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "level",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
             as: "level"
           }
         },
@@ -21643,15 +21645,9 @@ function useVisitorTransactionRepo() {
         {
           $lookup: {
             from: "building-units",
-            let: { unitId: { $toString: "$unit" } },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$unitId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "unit",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
             as: "unit"
           }
         },
@@ -22311,15 +22307,9 @@ function useVehicleRepo() {
       {
         $lookup: {
           from: "buildings",
-          let: { blockId: "$block" },
-          pipeline: [
-            {
-              $match: {
-                $expr: { $eq: ["$_id", "$$blockId"] }
-              }
-            },
-            { $project: { _id: 1, name: 1, block: 1 } }
-          ],
+          localField: "block",
+          foreignField: "_id",
+          pipeline: [{ $project: { name: 1, block: 1 } }],
           as: "block"
         }
       },
@@ -22327,15 +22317,9 @@ function useVehicleRepo() {
       {
         $lookup: {
           from: "building-levels",
-          let: { levelId: "$level" },
-          pipeline: [
-            {
-              $match: {
-                $expr: { $eq: ["$_id", "$$levelId"] }
-              }
-            },
-            { $project: { _id: 1, name: 1 } }
-          ],
+          localField: "level",
+          foreignField: "_id",
+          pipeline: [{ $project: { name: 1 } }],
           as: "level"
         }
       },
@@ -22343,15 +22327,9 @@ function useVehicleRepo() {
       {
         $lookup: {
           from: "building-units",
-          let: { unitId: "$unit" },
-          pipeline: [
-            {
-              $match: {
-                $expr: { $eq: ["$_id", "$$unitId"] }
-              }
-            },
-            { $project: { _id: 1, name: 1 } }
-          ],
+          localField: "unit",
+          foreignField: "_id",
+          pipeline: [{ $project: { name: 1 } }],
           as: "unit"
         }
       },
@@ -22616,15 +22594,9 @@ function useVehicleRepo() {
         {
           $lookup: {
             from: "buildings",
-            let: { blockId: "$block" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1, block: 1 } }
-            ],
+            localField: "block",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1, block: 1 } }],
             as: "block"
           }
         },
@@ -22632,15 +22604,9 @@ function useVehicleRepo() {
         {
           $lookup: {
             from: "building-levels",
-            let: { levelId: "$level" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "level",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
             as: "level"
           }
         },
@@ -22648,15 +22614,9 @@ function useVehicleRepo() {
         {
           $lookup: {
             from: "building-units",
-            let: { unitId: { $toString: "$unit" } },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$unitId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "unit",
+            foreignField: "_id",
+            pipeline: [{ $project: { name: 1 } }],
             as: "unit"
           }
         },
@@ -24621,15 +24581,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "buildings",
-            let: { blockId: "$block" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$_id", "$$blockId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1, block: 1 } }
-            ],
+            localField: "block",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1, block: 1 } }],
             as: "block"
           }
         },
@@ -24637,15 +24591,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "building-levels",
-            let: { levelId: "$level" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$_id", "$$levelId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "level",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1 } }],
             as: "level"
           }
         },
@@ -24653,15 +24601,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "building-units",
-            let: { unitId: { $toString: "$unit" } },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$unitId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "unit",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1 } }],
             as: "unit"
           }
         },
@@ -24868,15 +24810,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "buildings",
-            let: { blockId: "$block" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$_id", "$$blockId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1, block: 1 } }
-            ],
+            localField: "block",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1, block: 1 } }],
             as: "block"
           }
         },
@@ -24884,15 +24820,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "building-levels",
-            let: { levelId: "$level" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$_id", "$$levelId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "level",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1 } }],
             as: "level"
           }
         },
@@ -24900,15 +24830,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "building-units",
-            let: { unitId: { $toString: "$unit" } },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$unitId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "unit",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1 } }],
             as: "unit"
           }
         },
@@ -24958,15 +24882,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "buildings",
-            let: { blockId: "$block" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$_id", "$$blockId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1, block: 1 } }
-            ],
+            localField: "block",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1, block: 1 } }],
             as: "block"
           }
         },
@@ -24974,15 +24892,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "building-levels",
-            let: { levelId: "$level" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$_id", "$$levelId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "level",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1 } }],
             as: "level"
           }
         },
@@ -24990,15 +24902,9 @@ function usePersonRepo() {
         {
           $lookup: {
             from: "building-units",
-            let: { unitId: { $toString: "$unit" } },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$unitId"] }
-                }
-              },
-              { $project: { _id: 1, name: 1 } }
-            ],
+            localField: "unit",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, name: 1 } }],
             as: "unit"
           }
         },
@@ -35159,10 +35065,37 @@ function usePersonService() {
       session?.endSession();
     }
   }
+  async function suspendResidentById(id) {
+    const session = import_node_server_utils111.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new import_node_server_utils111.BadRequestError("Database session not available.");
+    }
+    try {
+      session.startTransaction();
+      const person = await _getByUserId(id.toString());
+      if (!person)
+        throw new import_node_server_utils111.NotFoundError("Person not found.");
+      await _updateById(person._id, { status: "deleted" }, session);
+      if (person.user) {
+        await _updateUserFieldById(
+          { _id: person.user.toString(), field: "status", value: "suspended" },
+          session
+        );
+      }
+      await session.commitTransaction();
+      return "Resident suspended successfully.";
+    } catch (error) {
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
   return {
     add,
     updateById,
-    reviewResidentPerson
+    reviewResidentPerson,
+    suspendResidentById
   };
 }
 
@@ -35182,7 +35115,8 @@ function usePersonController() {
   const {
     add: _add,
     updateById: _updateById,
-    reviewResidentPerson: _reviewResidentPerson
+    reviewResidentPerson: _reviewResidentPerson,
+    suspendResidentById: _suspendResidentById
   } = usePersonService();
   async function add(req, res, next) {
     const payload = { ...req.body };
@@ -35526,6 +35460,26 @@ function usePersonController() {
       const result = await _reviewResidentPerson(_id, req.body);
       res.status(200).json({ message: result });
       return;
+    } catch (error2) {
+      console.log("error", error2.message);
+      console.log("error", error2);
+      import_node_server_utils112.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function suspendResidentById(req, res, next) {
+    const _id = req.params.id;
+    const { error } = import_joi60.default.string().hex().required().validate(_id);
+    if (error) {
+      import_node_server_utils112.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils112.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const result = await _suspendResidentById(_id);
+      res.status(200).json({ message: result });
+      return;
     } catch (error2) {
       import_node_server_utils112.logger.log({ level: "error", message: error2.message });
       next(error2);
@@ -35544,7 +35498,8 @@ function usePersonController() {
     getPeopleByPlateNumber,
     getPeopleByNRIC,
     getPersonByUserId,
-    reviewResidentPerson
+    reviewResidentPerson,
+    suspendResidentById
   };
 }
 
@@ -53308,7 +53263,7 @@ function MIncidentReport(value) {
     approvedByName: value.approvedByName ?? "",
     remarks: value.remarks ?? null,
     status: value.status ?? "pending",
-    platForm: value.platform ?? "",
+    platform: value.platform ?? "",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -65030,6 +64985,26 @@ function MFormEntry(value) {
     deletedAt: value.deletedAt ?? null
   };
 }
+var residentFormEntry = import_joi144.default.object({
+  _id: import_joi144.default.string().hex().optional().allow("", null),
+  typeOfForm: import_joi144.default.string().optional().allow("", null),
+  unitNumber: import_joi144.default.string().optional().allow(null, ""),
+  fields: import_joi144.default.object().pattern(
+    import_joi144.default.string(),
+    import_joi144.default.alternatives().try(
+      import_joi144.default.string(),
+      import_joi144.default.number(),
+      import_joi144.default.boolean(),
+      import_joi144.default.valid(null)
+    )
+  ).optional().allow(null, ""),
+  status: import_joi144.default.string().optional().allow("", null),
+  org: import_joi144.default.string().hex().optional().allow("", null),
+  site: import_joi144.default.string().hex().optional().allow("", null),
+  createdAt: import_joi144.default.date().optional().allow("", null),
+  updatedAt: import_joi144.default.date().optional().allow("", null),
+  deletedAt: import_joi144.default.date().optional().allow("", null)
+});
 
 // src/repositories/online-forms-v2.repository.ts
 var import_node_server_utils249 = require("@7365admin1/node-server-utils");
@@ -65106,7 +65081,8 @@ function useFormEntryRepo() {
     };
     if (search && search !== "") {
       query.$or = [
-        { formType: { $regex: search, $options: "i" } }
+        { typeOfForm: { $regex: search, $options: "i" } },
+        { unitNumber: { $regex: search, $options: "i" } }
       ];
     }
     const cacheKey = (0, import_node_server_utils249.makeCacheKey)(
@@ -65228,13 +65204,38 @@ function useFormEntryRepo() {
       throw new Error(error.message);
     }
   }
+  async function addResidentForm(value, session) {
+    try {
+      value.site = new import_mongodb146.ObjectId(value.site);
+      value.org = new import_mongodb146.ObjectId(value.org);
+      const res = await collection.insertOne(value, { session });
+      delNamespace().then(() => {
+        import_node_server_utils249.logger.info(
+          `Cache cleared for namespace: ${online_forms_namespace_collection}`
+        );
+      }).catch((err) => {
+        import_node_server_utils249.logger.error(
+          `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
+          err
+        );
+      });
+      return res.insertedId;
+    } catch (error) {
+      const isDuplicated = error.message.includes("duplicate");
+      if (isDuplicated) {
+        throw new import_node_server_utils249.BadRequestError("Online Form already exists.");
+      }
+      throw error;
+    }
+  }
   return {
     add,
     getAll,
     getFormEntryById,
     updateFormEntryById,
     createTextIndex,
-    deleteOnlineFormById
+    deleteOnlineFormById,
+    addResidentForm
   };
 }
 
@@ -65249,7 +65250,8 @@ function useFormEntryController() {
     getAll: _getAll,
     getFormEntryById: _getFormEntryById,
     updateFormEntryById: _updateFormEntryById,
-    deleteOnlineFormById: _deleteOnlineFormById
+    deleteOnlineFormById: _deleteOnlineFormById,
+    addResidentForm: _addResidentForm
   } = useFormEntryRepo();
   function toCamelCase(str) {
     return str.replace(/\s(.)/g, (_, char) => char.toUpperCase()).replace(/\s+/g, "").replace(/^(.)/, (_, char) => char.toLowerCase());
@@ -65363,7 +65365,7 @@ function useFormEntryController() {
   }
   async function updateFormEntryById(req, res, next) {
     try {
-      const { error, value } = schemaUpdateFormEntry.validate({
+      const { error, value } = residentFormEntry.validate({
         _id: req.params.id,
         ...req.body
       });
@@ -65428,13 +65430,35 @@ function useFormEntryController() {
       return;
     }
   }
+  async function residentFormSubmission(req, res, next) {
+    const payload = { ...req.body };
+    const { error } = residentFormEntry.validate(payload, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils250.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils250.BadRequestError(messages));
+      return;
+    }
+    try {
+      const data = await _addResidentForm(payload);
+      res.status(201).json({ message: data });
+      return;
+    } catch (error2) {
+      import_node_server_utils250.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     uploadFormEntrys,
     getAll,
     getFormEntryById,
     updateFormEntryById,
-    deleteFormEntryById
+    deleteFormEntryById,
+    residentFormSubmission
   };
 }
 
@@ -65834,6 +65858,7 @@ function useBuildingLevelController() {
   poolDashboardCollection,
   promoCodeSchema,
   remarksSchema,
+  residentFormEntry,
   robotSchema,
   schema,
   schemaApprovedBy,