@7365admin1/core 2.73.0 → 2.75.0

package/dist/index.mjs

@@ -4193,6 +4193,8 @@ var orgSchema = Joi8.object({
   busInst: Joi8.string().optional().allow("", null),
   status: Joi8.string().optional().allow("", null),
   defaultSite: Joi8.string().hex().optional().allow("", null),
+  terms: Joi8.string().optional().allow("", null),
+  policies: Joi8.string().optional().allow("", null),
   createdAt: Joi8.string().optional().allow("", null),
   updatedAt: Joi8.string().optional().allow("", null),
   deletedAt: Joi8.string().optional().allow("", null)
@@ -4220,6 +4222,8 @@ function MOrg(value) {
     busInst: value.busInst,
     status: value.status || "active",
     defaultSite: value.defaultSite,
+    terms: value.terms ?? "",
+    policies: value.policies ?? "",
     createdAt: value.createdAt || /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -4235,6 +4239,7 @@ function useOrgRepo() {
   }
   const namespace_collection = "organizations";
   const collection = db.collection(namespace_collection);
+  const rolesCollection = db.collection("roles");
   const { delNamespace, getCache, setCache } = useCache9(namespace_collection);
   async function createIndex() {
     try {
@@ -4714,6 +4719,26 @@ function useOrgRepo() {
       throw error;
     }
   }
+  async function getAdminOrgForResident() {
+    const role = await rolesCollection.findOne({ type: "admin" });
+    if (!role)
+      throw new NotFoundError7("Admin role not found.");
+    let orgId;
+    try {
+      orgId = new ObjectId15(role.org);
+    } catch {
+      throw new InternalServerError9(
+        "Invalid organization reference in admin role."
+      );
+    }
+    const org = await collection.findOne(
+      { _id: orgId },
+      { projection: { terms: 1, policies: 1, _id: 0 } }
+    );
+    if (!org)
+      throw new NotFoundError7("Organization not found.");
+    return org;
+  }
   return {
     createIndex,
     createTextIndex,
@@ -4728,7 +4753,8 @@ function useOrgRepo() {
     updateStatusById,
     deleteById,
     getOrgsByEmail,
-    getOrganizationsWithSubscription
+    getOrganizationsWithSubscription,
+    getAdminOrgForResident
   };
 }
 
@@ -5347,7 +5373,7 @@ function useSiteRepo() {
     try {
       const items = await collection.aggregate([
         ...basePipeline,
-        { $project: { _id: 1, name: 1, orgId: 1 } },
+        { $project: { _id: 1, name: 1, orgId: 1, category: 1 } },
         { $skip: page * limit },
         { $limit: limit }
       ]).toArray();
@@ -8870,7 +8896,8 @@ function useOrgController() {
     getAll: _getAll,
     add: _add,
     update: _update,
-    getOrgsByEmail: _getOrgsByEmail
+    getOrgsByEmail: _getOrgsByEmail,
+    getAdminOrgForResident: _getAdminOrgForResident
   } = useOrgRepo();
   async function add(req, res, next) {
     const validation = Joi18.object({
@@ -8878,7 +8905,9 @@ function useOrgController() {
       type: Joi18.string().required(),
       nature: Joi18.string().valid(...allowedNatures).required(),
       email: Joi18.string().email().optional().allow("", null),
-      contact: Joi18.string().optional().allow("", null)
+      contact: Joi18.string().optional().allow("", null),
+      terms: Joi18.string().optional().allow("", null),
+      policies: Joi18.string().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -9084,7 +9113,9 @@ function useOrgController() {
       type: Joi18.string().optional(),
       nature: Joi18.string().valid(...allowedNatures).optional(),
       email: Joi18.string().email().allow("", null).optional(),
-      contact: Joi18.string().allow("", null).optional()
+      contact: Joi18.string().allow("", null).optional(),
+      terms: Joi18.string().optional().allow("", null),
+      policies: Joi18.string().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -9103,6 +9134,15 @@ function useOrgController() {
       next(err);
     }
   }
+  async function getAdminOrgForResident(_req, res, next) {
+    try {
+      const data = await _getAdminOrgForResident();
+      res.status(200).json(data);
+    } catch (error) {
+      logger25.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
   return {
     add,
     addOnboardingOrg,
@@ -9112,7 +9152,8 @@ function useOrgController() {
     getById,
     getByEmail,
     update,
-    getOrgsByEmail
+    getOrgsByEmail,
+    getAdminOrgForResident
   };
 }
 
@@ -14431,7 +14472,8 @@ var schemaPlate = Joi36.object({
 });
 var schemaFiles = Joi36.object({
   id: Joi36.string().hex().required(),
-  name: Joi36.string().optional().allow(null, "")
+  name: Joi36.string().optional().allow(null, ""),
+  mimeType: Joi36.string().optional().allow(null, "")
 });
 var schemaApprover = Joi36.object({
   id: Joi36.string().hex().required(),
@@ -14463,7 +14505,8 @@ var schemaPerson = Joi36.object({
   plateNumber: Joi36.string().optional().allow(null, ""),
   platform: Joi36.string().valid("web", "mobile").optional().allow(null, ""),
   approvedBy: schemaApprover.optional().allow(null, ""),
-  countryCode: Joi36.string().optional().allow(null, "")
+  countryCode: Joi36.string().optional().allow(null, ""),
+  callingCode: Joi36.string().optional().allow(null, "")
 });
 var schemaUpdatePerson = Joi36.object({
   _id: Joi36.string().hex().required(),
@@ -14479,6 +14522,9 @@ var schemaUpdatePerson = Joi36.object({
   email: Joi36.string().email().optional().allow(null, ""),
   nric: Joi36.string().optional().allow(null, ""),
   remarks: Joi36.string().optional().allow(null, ""),
+  type: Joi36.string().valid(...PERSON_TYPES).optional().allow(null, ""),
+  org: Joi36.string().hex().optional().allow(null, ""),
+  site: Joi36.string().hex().optional().allow(null, ""),
   companyName: Joi36.array().items(Joi36.string()).optional().allow(null, ""),
   plates: Joi36.array().items(schemaFiles).optional().allow(null, ""),
   isOwner: Joi36.boolean().optional().allow(null, ""),
@@ -14487,7 +14533,8 @@ var schemaUpdatePerson = Joi36.object({
   plateNumber: Joi36.string().optional().allow(null, ""),
   platform: Joi36.string().valid("web", "mobile").optional().allow(null, ""),
   approvedBy: schemaApprover.optional().allow(null, ""),
-  countryCode: Joi36.string().optional().allow(null, "")
+  countryCode: Joi36.string().optional().allow(null, ""),
+  callingCode: Joi36.string().optional().allow(null, "")
 });
 function MPerson(value) {
   const { error } = schemaPerson.validate(value);
@@ -14561,6 +14608,7 @@ function MPerson(value) {
     platForm: value.platform ?? "",
     approvedBy: value.approvedBy ?? { id: "", name: "" },
     countryCode: value.countryCode ?? "",
+    callingCode: value.callingCode ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -56788,6 +56836,11 @@ var FormEntryStatus = /* @__PURE__ */ ((FormEntryStatus2) => {
 var schemaFormEntry = Joi141.object({
   _id: Joi141.string().hex().optional().allow("", null),
   formType: Joi141.string().required(),
+  block: Joi141.string().optional().allow(null, ""),
+  level: Joi141.string().optional().allow(null, ""),
+  unit: Joi141.string().optional().allow(null, ""),
+  name: Joi141.string().optional().allow(null, ""),
+  phoneNumber: Joi141.string().optional().allow(null, ""),
   fields: Joi141.object().pattern(
     Joi141.string(),
     Joi141.alternatives().try(
@@ -56949,15 +57002,22 @@ function useFormEntryController() {
       }
       const headerRow = worksheet.getRow(1);
       const headers = headerRow.values.slice(1).map((h) => String(h ?? "").trim());
+      const knownKeys = ["block", "level", "unit", "name", "phoneNumber"];
+      const topLevel = {};
       const fields = {};
       headers.forEach((header) => {
-        fields[header] = null;
+        const normalized = toCamelCase(header);
+        if (knownKeys.includes(normalized)) {
+          topLevel[normalized] = null;
+        } else {
+          fields[normalized] = null;
+        }
       });
       const formType = req.file.originalname.replace(/\.[^/.]+$/, "");
-      const normalizedFields = normalizeKeys(fields);
       const payload = {
         formType,
-        fields: normalizedFields,
+        ...topLevel,
+        fields,
         status: "active" /* ACTIVE */
       };
       const { error, value } = schemaFormEntry.validate(payload, {