@7365admin1/core 3.3.0 → 3.4.0

package/dist/index.js

@@ -9171,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)
@@ -9218,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: ""
@@ -10068,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,
@@ -10089,7 +10124,8 @@ function useMemberRepo() {
     updateRoleById,
     getByRoles,
     updateSiteById,
-    getByUserIdTypeOrg
+    getByUserIdTypeOrg,
+    completeOnboardingById
   };
 }
 
@@ -10540,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),
@@ -10572,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(),
@@ -14183,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();
@@ -14254,7 +14285,8 @@ function useMemberService() {
     roleId,
     app,
     siteId,
-    siteName
+    siteName,
+    onboardingRequired
   }) {
     const session = import_node_server_utils30.useAtlas.getClient()?.startSession();
     session?.startTransaction();
@@ -14274,7 +14306,10 @@ function useMemberService() {
           role: roleId,
           type: app,
           siteId: siteId ?? "",
-          siteName: siteName ?? ""
+          siteName: siteName ?? "",
+          onboardingRequired,
+          onboardingCompleted: false,
+          onboardingCompletedAt: ""
         },
         session
       );
@@ -14344,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
   };
 }
 
@@ -14365,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;
@@ -14589,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) {
@@ -14597,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) {
@@ -14673,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,
@@ -14684,7 +14744,8 @@ function useMemberController() {
     updateRoleById,
     createMemberDirect,
     updateSiteById,
-    getByUserIdTypeOrg
+    getByUserIdTypeOrg,
+    completeOnboarding
   };
 }
 
@@ -15329,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.",
@@ -15498,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,
@@ -15537,8 +15569,7 @@ function useOrgController() {
     getByEmail,
     update,
     getOrgsByEmail,
-    getAdminOrgForResident,
-    completeOnboarding
+    getAdminOrgForResident
   };
 }
 
@@ -21518,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"
             }
           },
@@ -21534,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"
             }
           },
@@ -21550,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"
             }
           },
@@ -21612,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"
           }
         },
@@ -21628,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"
           }
         },
@@ -21644,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"
           }
         },
@@ -22312,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"
         }
       },
@@ -22328,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"
         }
       },
@@ -22344,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"
         }
       },
@@ -22617,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"
           }
         },
@@ -22633,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"
           }
         },
@@ -22649,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"
           }
         },
@@ -24622,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"
           }
         },
@@ -24638,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"
           }
         },
@@ -24654,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"
           }
         },
@@ -24869,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"
           }
         },
@@ -24885,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"
           }
         },
@@ -24901,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"
           }
         },
@@ -24959,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"
           }
         },
@@ -24975,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"
           }
         },
@@ -24991,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"
           }
         },
@@ -65082,7 +64987,7 @@ function MFormEntry(value) {
 }
 var residentFormEntry = import_joi144.default.object({
   _id: import_joi144.default.string().hex().optional().allow("", null),
-  typeOfForm: import_joi144.default.string().required(),
+  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(),
@@ -65092,7 +64997,7 @@ var residentFormEntry = import_joi144.default.object({
       import_joi144.default.boolean(),
       import_joi144.default.valid(null)
     )
-  ).required(),
+  ).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),
@@ -65176,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)(
@@ -65459,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
       });