@7365admin1/core 3.3.0 → 3.4.0

package/dist/index.mjs

@@ -8751,6 +8751,9 @@ function MMember(value) {
     siteId: Joi7.string().hex().optional().allow("", null),
     siteName: Joi7.string().optional().allow("", null),
     status: Joi7.string().optional().allow("", null),
+    onboardingRequired: Joi7.boolean().optional(),
+    onboardingCompleted: Joi7.boolean().optional(),
+    onboardingCompletedAt: Joi7.string().optional().allow("", null),
     createdAt: Joi7.string().optional().allow("", null),
     updatedAt: Joi7.string().optional().allow("", null),
     deletedAt: Joi7.string().optional().allow("", null)
@@ -8798,6 +8801,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: ""
@@ -9648,6 +9654,35 @@ function useMemberRepo() {
       );
     }
   }
+  async function completeOnboardingById(_id, session) {
+    try {
+      _id = new ObjectId11(_id);
+    } catch {
+      throw new BadRequestError11("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 NotFoundError5(
+        "Member not found or onboarding is not required."
+      );
+    }
+    await delNamespace();
+    return "Successfully completed onboarding.";
+  }
   return {
     createIndex,
     createUniqueIndex,
@@ -9669,7 +9704,8 @@ function useMemberRepo() {
     updateRoleById,
     getByRoles,
     updateSiteById,
-    getByUserIdTypeOrg
+    getByUserIdTypeOrg,
+    completeOnboardingById
   };
 }
 
@@ -10147,9 +10183,6 @@ var orgSchema = Joi8.object({
   busInst: Joi8.string().optional().allow("", null),
   status: Joi8.string().optional().allow("", null),
   defaultSite: Joi8.string().hex().optional().allow("", null),
-  onboardingRequired: Joi8.boolean().optional(),
-  onboardingCompleted: Joi8.boolean().optional(),
-  onboardingCompletedAt: Joi8.date().optional().allow(null),
   terms: Joi8.string().optional().allow("", null),
   policies: Joi8.string().optional().allow("", null),
   createdAt: Joi8.string().optional().allow("", null),
@@ -10179,9 +10212,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(),
@@ -13838,7 +13868,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();
@@ -13909,7 +13940,8 @@ function useMemberService() {
     roleId,
     app,
     siteId,
-    siteName
+    siteName,
+    onboardingRequired
   }) {
     const session = useAtlas15.getClient()?.startSession();
     session?.startTransaction();
@@ -13929,7 +13961,10 @@ function useMemberService() {
           role: roleId,
           type: app,
           siteId: siteId ?? "",
-          siteName: siteName ?? ""
+          siteName: siteName ?? "",
+          onboardingRequired,
+          onboardingCompleted: false,
+          onboardingCompletedAt: ""
         },
         session
       );
@@ -13999,12 +14034,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
   };
 }
 
@@ -14020,7 +14062,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 = Joi15.string().hex().required();
     const _id = req.params.id;
@@ -14244,7 +14286,8 @@ function useMemberController() {
       roleId: Joi15.string().hex().required(),
       app: Joi15.string().required(),
       siteId: Joi15.string().hex().optional().allow("", null),
-      siteName: Joi15.string().optional().allow("", null)
+      siteName: Joi15.string().optional().allow("", null),
+      onboardingRequired: Joi15.boolean().optional()
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -14252,9 +14295,9 @@ function useMemberController() {
       next(new BadRequestError30(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) {
@@ -14328,6 +14371,23 @@ function useMemberController() {
       return;
     }
   }
+  async function completeOnboarding(req, res, next) {
+    const validation = Joi15.object({
+      id: Joi15.string().hex().required()
+    });
+    const { error } = validation.validate(req.params);
+    if (error) {
+      return next(new BadRequestError30(error.message));
+    }
+    try {
+      const data = await _completeOnboarding(
+        req.params.id
+      );
+      res.json(data);
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     createMember,
     getByUserId,
@@ -14339,7 +14399,8 @@ function useMemberController() {
     updateRoleById,
     createMemberDirect,
     updateSiteById,
-    getByUserIdTypeOrg
+    getByUserIdTypeOrg,
+    completeOnboarding
   };
 }
 
@@ -14988,7 +15049,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.",
@@ -15157,35 +15218,6 @@ function useOrgController() {
       next(error);
     }
   }
-  async function completeOnboarding(req, res, next) {
-    const validation = Joi18.string().hex().required();
-    const id = req.params.id;
-    const { error } = validation.validate(id);
-    if (error) {
-      logger25.log({
-        level: "error",
-        message: error.message
-      });
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    try {
-      await _completeOnboardingById(id);
-      const data = await _getById(id);
-      res.json({
-        message: "Organization onboarding completed successfully",
-        data
-      });
-      return;
-    } catch (error2) {
-      logger25.log({
-        level: "error",
-        message: error2.message
-      });
-      next(error2);
-      return;
-    }
-  }
   return {
     add,
     addOnboardingOrg,
@@ -15196,8 +15228,7 @@ function useOrgController() {
     getByEmail,
     update,
     getOrgsByEmail,
-    getAdminOrgForResident,
-    completeOnboarding
+    getAdminOrgForResident
   };
 }
 
@@ -21282,15 +21313,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"
             }
           },
@@ -21298,15 +21323,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"
             }
           },
@@ -21314,15 +21333,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"
             }
           },
@@ -21376,15 +21389,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"
           }
         },
@@ -21392,15 +21399,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"
           }
         },
@@ -21408,15 +21409,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"
           }
         },
@@ -22085,15 +22080,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"
         }
       },
@@ -22101,15 +22090,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"
         }
       },
@@ -22117,15 +22100,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"
         }
       },
@@ -22390,15 +22367,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"
           }
         },
@@ -22406,15 +22377,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"
           }
         },
@@ -22422,15 +22387,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"
           }
         },
@@ -24409,15 +24368,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"
           }
         },
@@ -24425,15 +24378,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"
           }
         },
@@ -24441,15 +24388,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"
           }
         },
@@ -24656,15 +24597,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"
           }
         },
@@ -24672,15 +24607,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"
           }
         },
@@ -24688,15 +24617,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"
           }
         },
@@ -24746,15 +24669,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"
           }
         },
@@ -24762,15 +24679,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"
           }
         },
@@ -24778,15 +24689,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"
           }
         },
@@ -65375,7 +65280,7 @@ function MFormEntry(value) {
 }
 var residentFormEntry = Joi144.object({
   _id: Joi144.string().hex().optional().allow("", null),
-  typeOfForm: Joi144.string().required(),
+  typeOfForm: Joi144.string().optional().allow("", null),
   unitNumber: Joi144.string().optional().allow(null, ""),
   fields: Joi144.object().pattern(
     Joi144.string(),
@@ -65385,7 +65290,7 @@ var residentFormEntry = Joi144.object({
       Joi144.boolean(),
       Joi144.valid(null)
     )
-  ).required(),
+  ).optional().allow(null, ""),
   status: Joi144.string().optional().allow("", null),
   org: Joi144.string().hex().optional().allow("", null),
   site: Joi144.string().hex().optional().allow("", null),
@@ -65478,7 +65383,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 = makeCacheKey66(
@@ -65761,7 +65667,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
       });