@7365admin1/core 2.73.0 → 2.75.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 2.75.0
+
+### Minor Changes
+
+- ba3e599: release latest changes for person API, preloved API, etc.
+
+## 2.74.0
+
+### Minor Changes
+
+- 473d453: release changes for person api, organization api, etc
+
 ## 2.73.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -523,6 +523,8 @@ type TOrg = {
     busInst?: string;
     status?: string;
     defaultSite?: string;
+    terms?: string;
+    policies?: string;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
@@ -572,6 +574,7 @@ declare function useOrgRepo(): {
         pages: number;
         pageRange: string;
     }>;
+    getAdminOrgForResident: () => Promise<mongodb.WithId<bson.Document>>;
 };
 
 declare function useOrgController(): {
@@ -584,6 +587,7 @@ declare function useOrgController(): {
     getByEmail: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     update: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getOrgsByEmail: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getAdminOrgForResident: (_req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 /**
@@ -2608,6 +2612,7 @@ declare enum PersonStatus {
 type TFiles = {
     id: string | ObjectId;
     name: string;
+    mimeType?: string;
 };
 type TApprover = {
     id: string | ObjectId;
@@ -2641,6 +2646,7 @@ type TPerson = {
     platform?: string;
     approvedBy?: TApprover;
     countryCode?: string;
+    callingCode?: string;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
@@ -2679,6 +2685,7 @@ declare function MPerson(value: TPerson): {
     platForm: string;
     approvedBy: TApprover;
     countryCode: string;
+    callingCode: string;
     createdAt: string | Date;
     updatedAt: string | Date | undefined;
     deletedAt: string | Date | undefined;

package/dist/index.js

@@ -4605,6 +4605,8 @@ 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),
+  terms: import_joi8.default.string().optional().allow("", null),
+  policies: import_joi8.default.string().optional().allow("", null),
   createdAt: import_joi8.default.string().optional().allow("", null),
   updatedAt: import_joi8.default.string().optional().allow("", null),
   deletedAt: import_joi8.default.string().optional().allow("", null)
@@ -4632,6 +4634,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: ""
@@ -4647,6 +4651,7 @@ function useOrgRepo() {
   }
   const namespace_collection = "organizations";
   const collection = db.collection(namespace_collection);
+  const rolesCollection = db.collection("roles");
   const { delNamespace, getCache, setCache } = (0, import_node_server_utils17.useCache)(namespace_collection);
   async function createIndex() {
     try {
@@ -5126,6 +5131,26 @@ function useOrgRepo() {
       throw error;
     }
   }
+  async function getAdminOrgForResident() {
+    const role = await rolesCollection.findOne({ type: "admin" });
+    if (!role)
+      throw new import_node_server_utils17.NotFoundError("Admin role not found.");
+    let orgId;
+    try {
+      orgId = new import_mongodb15.ObjectId(role.org);
+    } catch {
+      throw new import_node_server_utils17.InternalServerError(
+        "Invalid organization reference in admin role."
+      );
+    }
+    const org = await collection.findOne(
+      { _id: orgId },
+      { projection: { terms: 1, policies: 1, _id: 0 } }
+    );
+    if (!org)
+      throw new import_node_server_utils17.NotFoundError("Organization not found.");
+    return org;
+  }
   return {
     createIndex,
     createTextIndex,
@@ -5140,7 +5165,8 @@ function useOrgRepo() {
     updateStatusById,
     deleteById,
     getOrgsByEmail,
-    getOrganizationsWithSubscription
+    getOrganizationsWithSubscription,
+    getAdminOrgForResident
   };
 }
 
@@ -5745,7 +5771,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();
@@ -9230,7 +9256,8 @@ function useOrgController() {
     getAll: _getAll,
     add: _add,
     update: _update,
-    getOrgsByEmail: _getOrgsByEmail
+    getOrgsByEmail: _getOrgsByEmail,
+    getAdminOrgForResident: _getAdminOrgForResident
   } = useOrgRepo();
   async function add(req, res, next) {
     const validation = import_joi18.default.object({
@@ -9238,7 +9265,9 @@ function useOrgController() {
       type: import_joi18.default.string().required(),
       nature: import_joi18.default.string().valid(...allowedNatures).required(),
       email: import_joi18.default.string().email().optional().allow("", null),
-      contact: import_joi18.default.string().optional().allow("", null)
+      contact: import_joi18.default.string().optional().allow("", null),
+      terms: import_joi18.default.string().optional().allow("", null),
+      policies: import_joi18.default.string().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -9444,7 +9473,9 @@ function useOrgController() {
       type: import_joi18.default.string().optional(),
       nature: import_joi18.default.string().valid(...allowedNatures).optional(),
       email: import_joi18.default.string().email().allow("", null).optional(),
-      contact: import_joi18.default.string().allow("", null).optional()
+      contact: import_joi18.default.string().allow("", null).optional(),
+      terms: import_joi18.default.string().optional().allow("", null),
+      policies: import_joi18.default.string().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -9463,6 +9494,15 @@ function useOrgController() {
       next(err);
     }
   }
+  async function getAdminOrgForResident(_req, res, next) {
+    try {
+      const data = await _getAdminOrgForResident();
+      res.status(200).json(data);
+    } catch (error) {
+      import_node_server_utils35.logger.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
   return {
     add,
     addOnboardingOrg,
@@ -9472,7 +9512,8 @@ function useOrgController() {
     getById,
     getByEmail,
     update,
-    getOrgsByEmail
+    getOrgsByEmail,
+    getAdminOrgForResident
   };
 }
 
@@ -14686,7 +14727,8 @@ var schemaPlate = import_joi36.default.object({
 });
 var schemaFiles = import_joi36.default.object({
   id: import_joi36.default.string().hex().required(),
-  name: import_joi36.default.string().optional().allow(null, "")
+  name: import_joi36.default.string().optional().allow(null, ""),
+  mimeType: import_joi36.default.string().optional().allow(null, "")
 });
 var schemaApprover = import_joi36.default.object({
   id: import_joi36.default.string().hex().required(),
@@ -14718,7 +14760,8 @@ var schemaPerson = import_joi36.default.object({
   plateNumber: import_joi36.default.string().optional().allow(null, ""),
   platform: import_joi36.default.string().valid("web", "mobile").optional().allow(null, ""),
   approvedBy: schemaApprover.optional().allow(null, ""),
-  countryCode: import_joi36.default.string().optional().allow(null, "")
+  countryCode: import_joi36.default.string().optional().allow(null, ""),
+  callingCode: import_joi36.default.string().optional().allow(null, "")
 });
 var schemaUpdatePerson = import_joi36.default.object({
   _id: import_joi36.default.string().hex().required(),
@@ -14734,6 +14777,9 @@ var schemaUpdatePerson = import_joi36.default.object({
   email: import_joi36.default.string().email().optional().allow(null, ""),
   nric: import_joi36.default.string().optional().allow(null, ""),
   remarks: import_joi36.default.string().optional().allow(null, ""),
+  type: import_joi36.default.string().valid(...PERSON_TYPES).optional().allow(null, ""),
+  org: import_joi36.default.string().hex().optional().allow(null, ""),
+  site: import_joi36.default.string().hex().optional().allow(null, ""),
   companyName: import_joi36.default.array().items(import_joi36.default.string()).optional().allow(null, ""),
   plates: import_joi36.default.array().items(schemaFiles).optional().allow(null, ""),
   isOwner: import_joi36.default.boolean().optional().allow(null, ""),
@@ -14742,7 +14788,8 @@ var schemaUpdatePerson = import_joi36.default.object({
   plateNumber: import_joi36.default.string().optional().allow(null, ""),
   platform: import_joi36.default.string().valid("web", "mobile").optional().allow(null, ""),
   approvedBy: schemaApprover.optional().allow(null, ""),
-  countryCode: import_joi36.default.string().optional().allow(null, "")
+  countryCode: import_joi36.default.string().optional().allow(null, ""),
+  callingCode: import_joi36.default.string().optional().allow(null, "")
 });
 function MPerson(value) {
   const { error } = schemaPerson.validate(value);
@@ -14816,6 +14863,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
@@ -56519,6 +56567,11 @@ var FormEntryStatus = /* @__PURE__ */ ((FormEntryStatus2) => {
 var schemaFormEntry = import_joi141.default.object({
   _id: import_joi141.default.string().hex().optional().allow("", null),
   formType: import_joi141.default.string().required(),
+  block: import_joi141.default.string().optional().allow(null, ""),
+  level: import_joi141.default.string().optional().allow(null, ""),
+  unit: import_joi141.default.string().optional().allow(null, ""),
+  name: import_joi141.default.string().optional().allow(null, ""),
+  phoneNumber: import_joi141.default.string().optional().allow(null, ""),
   fields: import_joi141.default.object().pattern(
     import_joi141.default.string(),
     import_joi141.default.alternatives().try(
@@ -56674,15 +56727,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, {