@7365admin1/core 3.18.0 → 3.19.0

package/dist/index.mjs

@@ -12092,7 +12092,8 @@ function useVerificationService() {
     email,
     orgId,
     siteId,
-    siteName
+    siteName,
+    inviteType
   }) {
     const schema2 = Joi11.object({
       email: Joi11.string().email().lowercase().required(),
@@ -12129,11 +12130,11 @@ function useVerificationService() {
     };
     try {
       const org = await getOrgById(orgId);
-      if (org) {
-        value.type = "service-provider-create-org" /* SERVICE_PROVIDER_CREATE_ORG */;
+      if (inviteType === "organization-invite") {
+        value.type = "service-provider-invite" /* SERVICE_PROVIDER_INVITE */;
         subject = "Service Provider Organization Invite" /* _SERVICE_PROVIDER_ORGANIZATION_INVITE */;
       } else {
-        value.type = "service-provider-invite" /* SERVICE_PROVIDER_INVITE */;
+        value.type = "service-provider-create-org" /* SERVICE_PROVIDER_CREATE_ORG */;
         subject = "Service Provider Invite" /* _SERVICE_PROVIDER_INVITE */;
       }
       const res = await _add(value);
@@ -14728,25 +14729,47 @@ function useVerificationController() {
       email: Joi16.string().email().required(),
       orgId: Joi16.string().hex().required(),
       siteId: Joi16.string().hex().required(),
-      siteName: Joi16.string().required()
+      siteName: Joi16.string().required(),
+      inviteType: Joi16.string().valid("create-org", "organization-invite").required()
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger22.log({ level: "error", message: `controller - ${error.message}` });
+      logger22.log({
+        level: "error",
+        message: `controller - ${error.message}`
+      });
       next(new BadRequestError31(`Invalid input: ${error.message}`));
       return;
     }
+    const {
+      email,
+      orgId,
+      siteId,
+      siteName,
+      inviteType
+    } = payload;
     try {
-      await _createServiceProviderInvite(payload);
+      await _createServiceProviderInvite({
+        email,
+        orgId,
+        siteId,
+        siteName,
+        inviteType
+      });
       const cookieOptions = {
         domain: DOMAIN,
         secure: true,
         maxAge: 4 * 60 * 60 * 1e3
       };
-      res.cookie("service-provider-email", payload.email, cookieOptions).json({ message: "Successfully invited service provider." });
+      res.cookie("service-provider-email", email, cookieOptions).json({
+        message: "Successfully invited service provider."
+      });
       return;
     } catch (error2) {
-      logger22.log({ level: "error", message: `controller - ${error2.message}` });
+      logger22.log({
+        level: "error",
+        message: `controller - ${error2.message}`
+      });
       next(error2);
       return;
     }
@@ -15106,421 +15129,77 @@ function useFileController() {
 
 // src/controllers/organization.controller.ts
 import {
-  BadRequestError as BadRequestError33,
-  logger as logger25,
+  BadRequestError as BadRequestError35,
+  logger as logger26,
   NotFoundError as NotFoundError11
 } from "@7365admin1/node-server-utils";
-import Joi18 from "joi";
-function useOrgController() {
-  const { getOrgsByMembership } = useMemberRepo();
-  const {
-    getByName: _getByName,
-    getById: _getById,
-    getByEmail: _getByEmail,
-    getAll: _getAll,
-    add: _add,
-    update: _update,
-    getOrgsByEmail: _getOrgsByEmail,
-    getAdminOrgForResident: _getAdminOrgForResident,
-    completeOnboardingById: _completeOnboardingById
-  } = useOrgRepo();
-  async function add(req, res, next) {
-    const validation = Joi18.object({
-      name: Joi18.string().required(),
-      type: Joi18.string().required(),
-      nature: Joi18.string().valid(...allowedNatures).required(),
-      email: Joi18.string().email().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) {
-      logger25.log({ level: "error", message: error.message });
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    try {
-      await _add(req.body);
-      res.status(201).json({ message: "Successfully created organization." });
-      return;
-    } catch (error2) {
-      logger25.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getAll(req, res, next) {
-    const validation = Joi18.object({
-      search: Joi18.string().optional().allow("", null),
-      page: Joi18.number().integer().min(1).allow("", null).default(1),
-      limit: Joi18.number().integer().min(1).max(100).allow("", null).default(10),
-      nature: Joi18.string().valid(...allowedNatures).optional().allow("", null),
-      sort: Joi18.string().optional().allow("", null)
-    });
-    const query = { ...req.query };
-    const { error } = validation.validate(query);
-    if (error) {
-      logger25.log({ level: "error", message: error.message });
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    const search = req.query.search ?? "";
-    const page = parseInt(req.query.page ?? "1");
-    const limit = parseInt(req.query.limit ?? "10");
-    const nature = req.query.nature ?? "";
-    try {
-      const data = await _getAll({
-        search,
-        page,
-        limit,
-        nature
-      });
-      res.json(data);
-      return;
-    } catch (error2) {
-      logger25.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function addOnboardingOrg(req, res, next) {
-    const validation = Joi18.object({
-      name: Joi18.string().required(),
-      type: Joi18.string().required(),
-      nature: Joi18.string().valid(...allowedNatures).required(),
-      email: Joi18.string().email().optional().allow("", null),
-      contact: Joi18.string().optional().allow("", null)
-    });
-    const { error } = validation.validate(req.body);
-    if (error) {
-      logger25.log({ level: "error", message: error.message });
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    try {
-      const _id = await _add(req.body);
-      const data = await _getById(_id);
-      res.status(201).json({
-        message: "Successfully created organization.",
-        data
-      });
-      return;
-    } catch (error2) {
-      logger25.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getOrgsByUserId(req, res, next) {
-    const validation = Joi18.object({
-      search: Joi18.string().optional().allow("", null),
-      page: Joi18.number().integer().min(1).allow("", null).default(1),
-      limit: Joi18.number().integer().min(1).max(100).allow("", null).default(10),
-      user: Joi18.string().hex().required(),
-      type: Joi18.string().optional().allow("", null)
-    });
-    const query = { ...req.query };
-    query.user = req.params.user;
-    const { error } = validation.validate(query);
-    if (error) {
-      logger25.log({ level: "error", message: error.message });
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    const search = req.query.search ?? "";
-    const page = parseInt(req.query.page ?? "1");
-    const limit = parseInt(req.query.limit ?? "10");
-    const user = req.params.user;
-    const type = req.query.type ?? "";
-    try {
-      const data = await getOrgsByMembership({
-        search,
-        page,
-        limit,
-        user,
-        type
-      });
-      res.json(data);
-      return;
-    } catch (error2) {
-      logger25.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getByName(req, res, next) {
-    const validation = Joi18.string().required();
-    const name = req.params.name;
-    const { error } = validation.validate(name);
-    if (error) {
-      logger25.log({ level: "error", message: error.message });
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    try {
-      const data = await _getByName(name);
-      res.json(data);
-      return;
-    } catch (error2) {
-      next(error2);
-      return;
-    }
-  }
-  async function getById(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 {
-      const data = await _getById(_id);
-      res.json(data);
-      return;
-    } catch (error2) {
-      logger25.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getByEmail(req, res, next) {
-    const validation = Joi18.string().required();
-    const email = req.params.email;
-    const { error } = validation.validate(email);
-    if (error) {
-      logger25.log({ level: "error", message: error.message });
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    try {
-      const data = await _getByEmail(email);
-      if (!data) {
-        next(new NotFoundError11("Organization not found."));
-        return;
-      }
-      res.json(data);
-      return;
-    } catch (error2) {
-      next(error2);
-      return;
-    }
-  }
-  async function getOrgsByEmail(req, res, next) {
-    const validation = Joi18.object({
-      email: Joi18.string().email().required()
-    });
-    const query = {
-      email: req.params.email
-    };
-    const { error } = validation.validate(query);
-    if (error) {
-      logger25.log({ level: "error", message: error.message });
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    const email = req.params.email;
-    try {
-      const data = await _getOrgsByEmail(email);
-      res.json(data);
-      return;
-    } catch (error2) {
-      logger25.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function update(req, res, next) {
-    const validation = Joi18.object({
-      name: Joi18.string().optional(),
-      type: Joi18.string().optional(),
-      nature: Joi18.string().valid(...allowedNatures).optional(),
-      email: Joi18.string().email().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) {
-      next(new BadRequestError33(error.message));
-      return;
-    }
-    const id = req.params.id;
-    try {
-      await _update(id, req.body);
-      const data = await _getById(id);
-      res.json({
-        message: "Organization updated successfully",
-        data
-      });
-    } catch (err) {
-      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,
-    getAll,
-    getOrgsByUserId,
-    getByName,
-    getById,
-    getByEmail,
-    update,
-    getOrgsByEmail,
-    getAdminOrgForResident
-  };
-}
+import Joi20 from "joi";
 
-// src/controllers/organization-v2.controller.ts
-import Joi19 from "joi";
-import { BadRequestError as BadRequestError34, logger as logger26 } from "@7365admin1/node-server-utils";
-function useOrgControllerV2() {
-  const { getAll: _getAll, getOrganizationsWithSubscription: _getOrganizationsWithSubscription } = useOrgRepo();
-  async function getAll(req, res, next) {
-    const validation = Joi19.object({
-      search: Joi19.string().optional().allow("", null),
-      page: Joi19.number().integer().min(1).allow("", null).default(1),
-      limit: Joi19.number().integer().min(1).max(100).allow("", null).default(10),
-      nature: Joi19.string().valid(...allowedNatures).optional().allow("", null),
-      status: Joi19.string().trim().valid("active", "suspended", "deleted").optional().empty("").default("active")
-    });
-    const query = { ...req.query };
-    const { error, value } = validation.validate(query, {
-      convert: true,
-      stripUnknown: true
-    });
-    if (error) {
-      logger26.log({ level: "error", message: error.message });
-      next(new BadRequestError34(error.message));
-      return;
-    }
-    const search = value.search ?? "";
-    const page = typeof value.page === "number" ? value.page : parseInt(String(value.page ?? "1"), 10);
-    const limit = typeof value.limit === "number" ? value.limit : parseInt(String(value.limit ?? "10"), 10);
-    const nature = value.nature ?? "";
-    const status = value.status;
-    try {
-      const data = await _getAll({
-        search,
-        page,
-        limit,
-        nature,
-        status
-      });
-      res.json(data);
-      return;
-    } catch (error2) {
-      logger26.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
-  async function getOrganizationsWithSubscription(req, res, next) {
-    const validation = Joi19.object({
-      search: Joi19.string().optional().allow("", null),
-      page: Joi19.number().integer().min(1).default(1),
-      limit: Joi19.number().integer().min(1).max(100).default(10),
-      status: Joi19.string().trim().valid("active", "suspended", "deleted").default("active"),
-      type: Joi19.string().optional().allow("", null),
-      billingCycle: Joi19.string().optional().allow("", null)
-    });
-    const { error, value } = validation.validate(
-      req.query,
-      {
-        convert: true,
-        stripUnknown: true
-      }
-    );
-    if (error) {
-      next(new BadRequestError34(error.message));
-      return;
-    }
-    try {
-      const data = await _getOrganizationsWithSubscription({
-        search: value.search ?? "",
-        page: value.page ?? 1,
-        limit: value.limit ?? 10,
-        status: value.status ?? "active",
-        type: value.type ?? "",
-        billingCycle: value.billingCycle ?? ""
-      });
-      res.json(data);
-    } catch (error2) {
-      next(error2);
-    }
-  }
-  return {
-    getAll,
-    getOrganizationsWithSubscription
-  };
-}
+// src/repositories/subscription.repo.ts
+import {
+  BadRequestError as BadRequestError34,
+  logger as logger25,
+  makeCacheKey as makeCacheKey13,
+  paginate as paginate11,
+  useAtlas as useAtlas17,
+  useCache as useCache14
+} from "@7365admin1/node-server-utils";
 
 // src/models/subscription.model.ts
-import { BadRequestError as BadRequestError35 } from "@7365admin1/node-server-utils";
-import Joi20 from "joi";
+import { BadRequestError as BadRequestError33 } from "@7365admin1/node-server-utils";
+import Joi18 from "joi";
 import { ObjectId as ObjectId22 } from "mongodb";
 var SubscriptionType = /* @__PURE__ */ ((SubscriptionType2) => {
   SubscriptionType2["ORGANIZATION"] = "organization";
   SubscriptionType2["AFFILIATE"] = "affiliate";
   return SubscriptionType2;
 })(SubscriptionType || {});
-var schema = Joi20.object({
-  user: Joi20.string().hex().required(),
-  amount: Joi20.number().min(0).required(),
-  payment_method_card_number: Joi20.string().optional().allow("", null),
-  payment_method_cardholder_name: Joi20.string().optional().allow("", null),
-  payment_method_expiry_month: Joi20.string().optional().allow("", null),
-  payment_method_expiry_year: Joi20.string().optional().allow("", null),
-  payment_method_cvv: Joi20.string().optional().allow("", null),
-  payment_method_type: Joi20.string().optional().allow("", null),
-  currency: Joi20.string().optional().allow("", null),
-  seats: Joi20.number().optional().min(0).allow(null),
+var schema = Joi18.object({
+  user: Joi18.string().hex().required(),
+  amount: Joi18.number().min(0).required(),
+  payment_method_card_number: Joi18.string().optional().allow("", null),
+  payment_method_cardholder_name: Joi18.string().optional().allow("", null),
+  payment_method_expiry_month: Joi18.string().optional().allow("", null),
+  payment_method_expiry_year: Joi18.string().optional().allow("", null),
+  payment_method_cvv: Joi18.string().optional().allow("", null),
+  payment_method_type: Joi18.string().optional().allow("", null),
+  currency: Joi18.string().optional().allow("", null),
+  seats: Joi18.number().optional().min(0).allow(null),
   organization: orgSchema.optional().allow({}),
-  billingAddress: Joi20.object({
-    type: Joi20.string().required(),
-    country: Joi20.string().required(),
-    address: Joi20.string().required(),
-    continuedAddress: Joi20.string().optional().allow("", null),
-    city: Joi20.string().required(),
-    province: Joi20.string().optional().allow("", null),
-    postalCode: Joi20.string().required(),
-    taxId: Joi20.string().optional().allow("", null)
+  billingAddress: Joi18.object({
+    type: Joi18.string().required(),
+    country: Joi18.string().required(),
+    address: Joi18.string().required(),
+    continuedAddress: Joi18.string().optional().allow("", null),
+    city: Joi18.string().required(),
+    province: Joi18.string().optional().allow("", null),
+    postalCode: Joi18.string().required(),
+    taxId: Joi18.string().optional().allow("", null)
   }).required(),
-  promoCode: Joi20.string().optional().allow("", null)
+  promoCode: Joi18.string().optional().allow("", null)
 });
 function MSubscription(value) {
-  const schema2 = Joi20.object({
-    _id: Joi20.string().hex().optional().allow("", null),
-    user: Joi20.string().hex().optional().allow("", null),
-    org: Joi20.string().hex().optional().allow("", null),
-    amount: Joi20.number().min(0).required(),
-    currency: Joi20.string().required(),
-    description: Joi20.string().optional().allow("", null),
-    promoCode: Joi20.string().optional().allow("", null),
-    type: Joi20.string().valid(...Object.values(SubscriptionType)).optional().allow(null, ""),
-    paidSeats: Joi20.number().optional().min(0).allow("", null),
-    currentSeats: Joi20.number().optional().min(0).allow("", null),
-    maxSeats: Joi20.number().optional().min(0).allow("", null),
-    status: Joi20.string().optional().allow("", null),
-    billingCycle: Joi20.string().valid("monthly", "yearly").required(),
+  const schema2 = Joi18.object({
+    _id: Joi18.string().hex().optional().allow("", null),
+    user: Joi18.string().hex().optional().allow("", null),
+    org: Joi18.string().hex().optional().allow("", null),
+    amount: Joi18.number().min(0).required(),
+    currency: Joi18.string().required(),
+    description: Joi18.string().optional().allow("", null),
+    promoCode: Joi18.string().optional().allow("", null),
+    type: Joi18.string().valid(...Object.values(SubscriptionType)).optional().allow(null, ""),
+    paidSeats: Joi18.number().optional().min(0).allow("", null),
+    currentSeats: Joi18.number().optional().min(0).allow("", null),
+    maxSeats: Joi18.number().optional().min(0).allow("", null),
+    status: Joi18.string().optional().allow("", null),
+    billingCycle: Joi18.string().valid("monthly", "yearly").required(),
     // Ensure valid values
-    nextBillingDate: Joi20.date().optional(),
-    lastPaymentStatus: Joi20.string().optional().allow("", null),
-    failedAttempts: Joi20.number().optional().allow("", null),
-    createdAt: Joi20.date().optional(),
-    updatedAt: Joi20.string().optional().allow("", null),
-    deletedAt: Joi20.string().optional().allow("", null)
+    nextBillingDate: Joi18.date().optional(),
+    lastPaymentStatus: Joi18.string().optional().allow("", null),
+    failedAttempts: Joi18.number().optional().allow("", null),
+    createdAt: Joi18.date().optional(),
+    updatedAt: Joi18.string().optional().allow("", null),
+    deletedAt: Joi18.string().optional().allow("", null)
   }).custom((value2, helpers) => {
     if (!value2.user && !value2.org) {
       return helpers.error("any.invalid", {
@@ -15531,7 +15210,7 @@ function MSubscription(value) {
   });
   const { error } = schema2.validate(value);
   if (error) {
-    throw new BadRequestError35(error.details[0].message);
+    throw new BadRequestError33(error.details[0].message);
   }
   if (value._id)
     value._id = new ObjectId22(value._id);
@@ -15571,20 +15250,12 @@ function MSubscription(value) {
 }
 
 // src/repositories/subscription.repo.ts
-import {
-  BadRequestError as BadRequestError36,
-  logger as logger27,
-  makeCacheKey as makeCacheKey13,
-  paginate as paginate11,
-  useAtlas as useAtlas17,
-  useCache as useCache14
-} from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId23 } from "mongodb";
-import Joi21 from "joi";
+import Joi19 from "joi";
 function useSubscriptionRepo() {
   const db = useAtlas17.getDb();
   if (!db) {
-    throw new BadRequestError36("Unable to connect to server.");
+    throw new BadRequestError34("Unable to connect to server.");
   }
   const namespace_collection = "subscriptions";
   const collection = db.collection(namespace_collection);
@@ -15599,7 +15270,7 @@ function useSubscriptionRepo() {
         { key: { failedAttempts: 1 } }
       ]);
     } catch (error) {
-      throw new BadRequestError36("Failed to create index on subscription.");
+      throw new BadRequestError34("Failed to create index on subscription.");
     }
   }
   async function createUniqueIndex() {
@@ -15609,7 +15280,7 @@ function useSubscriptionRepo() {
         { unique: true }
       );
     } catch (error) {
-      throw new BadRequestError36(
+      throw new BadRequestError34(
         "Failed to create unique index on subscription."
       );
     }
@@ -15620,76 +15291,76 @@ function useSubscriptionRepo() {
       value = MSubscription(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger27.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger25.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger27.error(
+        logger25.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
       });
       return res.insertedId;
     } catch (error) {
-      logger27.log({ level: "error", message: `${error}` });
+      logger25.log({ level: "error", message: `${error}` });
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
-        throw new BadRequestError36("Subscription already exists.");
+        throw new BadRequestError34("Subscription already exists.");
       }
-      throw new BadRequestError36("Failed to create subscription.");
+      throw new BadRequestError34("Failed to create subscription.");
     }
   }
   async function getById(_id) {
     try {
       _id = new ObjectId23(_id);
     } catch (error) {
-      throw new BadRequestError36("Invalid subscription ID format.");
+      throw new BadRequestError34("Invalid subscription ID format.");
     }
     try {
       const cacheKey = makeCacheKey13(namespace_collection, { _id });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger27.info(`Cache hit for key: ${cacheKey}`);
+        logger25.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
       const data = await collection.findOne({ _id });
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      throw new BadRequestError36("Failed to get subscription by ID.");
+      throw new BadRequestError34("Failed to get subscription by ID.");
     }
   }
   async function getByUserId(user) {
     try {
       user = new ObjectId23(user);
     } catch (error) {
-      throw new BadRequestError36("Invalid user ID format.");
+      throw new BadRequestError34("Invalid user ID format.");
     }
     try {
       const cacheKey = makeCacheKey13(namespace_collection, { user });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger27.info(`Cache hit for key: ${cacheKey}`);
+        logger25.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
       const data = await collection.findOne({ user });
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      throw new BadRequestError36("Failed to get subscription by ID.");
+      throw new BadRequestError34("Failed to get subscription by ID.");
     }
   }
   async function getByAffiliateUserId(user) {
     try {
       user = new ObjectId23(user);
     } catch (error) {
-      throw new BadRequestError36("Invalid user ID format.");
+      throw new BadRequestError34("Invalid user ID format.");
     }
     try {
       const cacheKey = makeCacheKey13(namespace_collection, {
@@ -15698,7 +15369,7 @@ function useSubscriptionRepo() {
       });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger27.info(`Cache hit for key: ${cacheKey}`);
+        logger25.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
       const data = await collection.findOne({
@@ -15706,20 +15377,20 @@ function useSubscriptionRepo() {
         type: "affiliate"
       });
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      throw new BadRequestError36("Failed to get subscription by ID.");
+      throw new BadRequestError34("Failed to get subscription by ID.");
     }
   }
   async function getByOrgId(org) {
     try {
       org = new ObjectId23(org);
     } catch (error) {
-      throw new BadRequestError36("Invalid org ID format.");
+      throw new BadRequestError34("Invalid org ID format.");
     }
     try {
       const cacheKey = makeCacheKey13(namespace_collection, {
@@ -15728,7 +15399,7 @@ function useSubscriptionRepo() {
       });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger27.info(`Cache hit for key: ${cacheKey}`);
+        logger25.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
       const data = await collection.findOne({
@@ -15736,13 +15407,13 @@ function useSubscriptionRepo() {
         type: "organization"
       });
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      throw new BadRequestError36("Failed to get subscription by ID.");
+      throw new BadRequestError34("Failed to get subscription by ID.");
     }
   }
   async function getBySubscriptionId(subscriptionId) {
@@ -15750,18 +15421,18 @@ function useSubscriptionRepo() {
       const cacheKey = makeCacheKey13(namespace_collection, { subscriptionId });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger27.info(`Cache hit for key: ${cacheKey}`);
+        logger25.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
       const data = await collection.findOne({ subscriptionId });
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      throw new BadRequestError36(
+      throw new BadRequestError34(
         "Failed to get subscription by subscription ID."
       );
     }
@@ -15785,7 +15456,7 @@ function useSubscriptionRepo() {
     const cacheKey = makeCacheKey13(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger27.info(`Cache hit for key: ${cacheKey}`);
+      logger25.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -15798,13 +15469,13 @@ function useSubscriptionRepo() {
       const length = await collection.countDocuments(query);
       const data = paginate11(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      logger27.log({ level: "error", message: `${error}` });
+      logger25.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -15812,19 +15483,19 @@ function useSubscriptionRepo() {
     try {
       _id = new ObjectId23(_id);
     } catch (error) {
-      throw new BadRequestError36("Invalid subscription ID format.");
+      throw new BadRequestError34("Invalid subscription ID format.");
     }
     try {
       await collection.updateOne({ _id }, { $set: { status } });
       const cacheKey = makeCacheKey13(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
-        logger27.info(`Cache deleted for key: ${cacheKey}`);
+        logger25.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to delete cache for key: ${cacheKey}`, err);
       });
       return "Successfully updated subscription status.";
     } catch (error) {
-      throw new BadRequestError36("Failed to update subscription status.");
+      throw new BadRequestError34("Failed to update subscription status.");
     }
   }
   async function getDueSubscriptions(BATCH_SIZE = 100) {
@@ -15851,7 +15522,7 @@ function useSubscriptionRepo() {
     const cacheKey = makeCacheKey13(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger27.info(`Cache hit for key: ${cacheKey}`);
+      logger25.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -15873,13 +15544,13 @@ function useSubscriptionRepo() {
         ]
       }).sort({ nextBillingDate: 1 }).limit(BATCH_SIZE).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      throw new BadRequestError36("Failed to get due subscriptions.");
+      throw new BadRequestError34("Failed to get due subscriptions.");
     }
   }
   async function getFailedSubscriptions(BATCH_SIZE = 100) {
@@ -15890,7 +15561,7 @@ function useSubscriptionRepo() {
     const cacheKey = makeCacheKey13(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger27.info(`Cache hit for key: ${cacheKey}`);
+      logger25.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -15899,13 +15570,13 @@ function useSubscriptionRepo() {
         status: "active"
       }).limit(BATCH_SIZE).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      throw new BadRequestError36("Failed to get failed subscriptions.");
+      throw new BadRequestError34("Failed to get failed subscriptions.");
     }
   }
   async function findOrgSubscriptionsForStatusSync() {
@@ -15919,7 +15590,7 @@ function useSubscriptionRepo() {
       ).toArray();
       return data;
     } catch (error) {
-      throw new BadRequestError36(
+      throw new BadRequestError34(
         "Failed to list organization subscriptions for status sync."
       );
     }
@@ -15938,24 +15609,24 @@ function useSubscriptionRepo() {
       ).toArray();
       return data;
     } catch (error) {
-      throw new BadRequestError36(
+      throw new BadRequestError34(
         "Failed to list organization subscriptions with overdue next billing date."
       );
     }
   }
   async function processSuccessfulPayment(value, session) {
-    const schema2 = Joi21.object({
-      _id: Joi21.string().hex().required(),
-      nextBillingDate: Joi21.date().required()
+    const schema2 = Joi19.object({
+      _id: Joi19.string().hex().required(),
+      nextBillingDate: Joi19.date().required()
     });
     const { error } = schema2.validate(value);
     if (error) {
-      throw new BadRequestError36(error.message);
+      throw new BadRequestError34(error.message);
     }
     try {
       value._id = new ObjectId23(value._id);
     } catch (error2) {
-      throw new BadRequestError36("Invalid subscription ID format.");
+      throw new BadRequestError34("Invalid subscription ID format.");
     }
     const date = value.nextBillingDate;
     try {
@@ -15973,31 +15644,31 @@ function useSubscriptionRepo() {
         },
         { session }
       );
-      logger27.info(`${res.modifiedCount} subscription updated.`);
+      logger25.info(`${res.modifiedCount} subscription updated.`);
       const cacheKey = makeCacheKey13(namespace_collection, { _id: value._id });
       delCache(cacheKey).then(() => {
-        logger27.info(`Cache deleted for key: ${cacheKey}`);
+        logger25.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to delete cache for key: ${cacheKey}`, err);
       });
       return "Successfully updated subscription.";
     } catch (error2) {
-      logger27.error(`${error2}`);
-      throw new BadRequestError36("Failed to update subscription.");
+      logger25.error(`${error2}`);
+      throw new BadRequestError34("Failed to update subscription.");
     }
   }
   async function markSubscriptionAsFailed({ _id, failed }, session) {
-    const schema2 = Joi21.object({
-      _id: Joi21.string().hex().required()
+    const schema2 = Joi19.object({
+      _id: Joi19.string().hex().required()
     });
     const { error } = schema2.validate({ _id });
     if (error) {
-      throw new BadRequestError36(error.message);
+      throw new BadRequestError34(error.message);
     }
     try {
       _id = new ObjectId23(_id);
     } catch (error2) {
-      throw new BadRequestError36("Invalid subscription ID format.");
+      throw new BadRequestError34("Invalid subscription ID format.");
     }
     const updateOptions = {
       $inc: { failedAttempts: 1 }
@@ -16011,27 +15682,27 @@ function useSubscriptionRepo() {
       });
       const cacheKey = makeCacheKey13(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
-        logger27.info(`Cache deleted for key: ${cacheKey}`);
+        logger25.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to delete cache for key: ${cacheKey}`, err);
       });
       return result;
     } catch (error2) {
-      throw new BadRequestError36("Failed to update subscription.");
+      throw new BadRequestError34("Failed to update subscription.");
     }
   }
   async function markSubscriptionAsCanceled(_id, session) {
-    const schema2 = Joi21.object({
-      _id: Joi21.string().hex().required()
+    const schema2 = Joi19.object({
+      _id: Joi19.string().hex().required()
     });
     const { error } = schema2.validate({ _id });
     if (error) {
-      throw new BadRequestError36(error.message);
+      throw new BadRequestError34(error.message);
     }
     try {
       _id = new ObjectId23(_id);
     } catch (error2) {
-      throw new BadRequestError36("Invalid subscription ID format.");
+      throw new BadRequestError34("Invalid subscription ID format.");
     }
     try {
       const result = await collection.updateOne(
@@ -16041,27 +15712,27 @@ function useSubscriptionRepo() {
       );
       const cacheKey = makeCacheKey13(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
-        logger27.info(`Cache deleted for key: ${cacheKey}`);
+        logger25.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to delete cache for key: ${cacheKey}`, err);
       });
       return result;
     } catch (error2) {
-      throw new BadRequestError36("Failed to update subscription.");
+      throw new BadRequestError34("Failed to update subscription.");
     }
   }
   async function updateStatusById(_id, status, session) {
-    const schema2 = Joi21.object({
-      _id: Joi21.string().hex().required()
+    const schema2 = Joi19.object({
+      _id: Joi19.string().hex().required()
     });
     const { error } = schema2.validate({ _id });
     if (error) {
-      throw new BadRequestError36(error.message);
+      throw new BadRequestError34(error.message);
     }
     try {
       _id = new ObjectId23(_id);
     } catch (error2) {
-      throw new BadRequestError36("Invalid subscription ID format.");
+      throw new BadRequestError34("Invalid subscription ID format.");
     }
     try {
       const result = await collection.updateOne(
@@ -16071,13 +15742,13 @@ function useSubscriptionRepo() {
       );
       const cacheKey = makeCacheKey13(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
-        logger27.info(`Cache deleted for key: ${cacheKey}`);
+        logger25.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to delete cache for key: ${cacheKey}`, err);
       });
       return result;
     } catch (error2) {
-      throw new BadRequestError36("Failed to update subscription status.");
+      throw new BadRequestError34("Failed to update subscription status.");
     }
   }
   async function updateSeatsById({
@@ -16088,13 +15759,13 @@ function useSubscriptionRepo() {
     amount,
     promoCode
   }, session) {
-    const schema2 = Joi21.object({
-      _id: Joi21.string().hex().required(),
-      currentSeats: Joi21.number().required().min(1),
-      maxSeats: Joi21.number().required().min(0),
-      paidSeats: Joi21.number().optional().min(0),
-      amount: Joi21.number().required().min(0),
-      promoCode: Joi21.string().optional().allow("", null)
+    const schema2 = Joi19.object({
+      _id: Joi19.string().hex().required(),
+      currentSeats: Joi19.number().required().min(1),
+      maxSeats: Joi19.number().required().min(0),
+      paidSeats: Joi19.number().optional().min(0),
+      amount: Joi19.number().required().min(0),
+      promoCode: Joi19.string().optional().allow("", null)
     });
     const { error } = schema2.validate({
       _id,
@@ -16105,12 +15776,12 @@ function useSubscriptionRepo() {
       promoCode
     });
     if (error) {
-      throw new BadRequestError36(error.message);
+      throw new BadRequestError34(error.message);
     }
     try {
       _id = new ObjectId23(_id);
     } catch (error2) {
-      throw new BadRequestError36("Invalid subscription ID format.");
+      throw new BadRequestError34("Invalid subscription ID format.");
     }
     const data = {
       currentSeats,
@@ -16131,31 +15802,31 @@ function useSubscriptionRepo() {
       );
       const cacheKey = makeCacheKey13(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
-        logger27.info(`Cache deleted for key: ${cacheKey}`);
+        logger25.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to delete cache for key: ${cacheKey}`, err);
       });
       return result;
     } catch (error2) {
-      throw new BadRequestError36("Failed to update subscription seats.");
+      throw new BadRequestError34("Failed to update subscription seats.");
     }
   }
   async function updateMaxSeatsById({
     _id,
     seats
   }, session) {
-    const schema2 = Joi21.object({
-      _id: Joi21.string().hex().required(),
-      seats: Joi21.number().required().min(1)
+    const schema2 = Joi19.object({
+      _id: Joi19.string().hex().required(),
+      seats: Joi19.number().required().min(1)
     });
     const { error } = schema2.validate({ _id, seats });
     if (error) {
-      throw new BadRequestError36(error.message);
+      throw new BadRequestError34(error.message);
     }
     try {
       _id = new ObjectId23(_id);
     } catch (error2) {
-      throw new BadRequestError36("Invalid subscription ID format.");
+      throw new BadRequestError34("Invalid subscription ID format.");
     }
     try {
       const result = await collection.updateOne(
@@ -16165,13 +15836,13 @@ function useSubscriptionRepo() {
       );
       const cacheKey = makeCacheKey13(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
-        logger27.info(`Cache deleted for key: ${cacheKey}`);
+        logger25.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to delete cache for key: ${cacheKey}`, err);
       });
       return result;
     } catch (error2) {
-      throw new BadRequestError36("Failed to update subscription paid seats.");
+      throw new BadRequestError34("Failed to update subscription paid seats.");
     }
   }
   return {
@@ -16198,6 +15869,397 @@ function useSubscriptionRepo() {
   };
 }
 
+// src/controllers/organization.controller.ts
+function useOrgController() {
+  const { getOrgsByMembership } = useMemberRepo();
+  const {
+    getByName: _getByName,
+    getById: _getById,
+    getByEmail: _getByEmail,
+    getAll: _getAll,
+    add: _add,
+    update: _update,
+    getOrgsByEmail: _getOrgsByEmail,
+    getAdminOrgForResident: _getAdminOrgForResident,
+    completeOnboardingById: _completeOnboardingById,
+    updateStatusById: _updateStatusById
+  } = useOrgRepo();
+  const {
+    getByOrgId: _getSubscriptionByOrgId,
+    updateStatusById: _updateSubscriptionStatusById
+  } = useSubscriptionRepo();
+  async function add(req, res, next) {
+    const validation = Joi20.object({
+      name: Joi20.string().required(),
+      type: Joi20.string().required(),
+      nature: Joi20.string().valid(...allowedNatures).required(),
+      email: Joi20.string().email().optional().allow("", null),
+      contact: Joi20.string().optional().allow("", null),
+      terms: Joi20.string().optional().allow("", null),
+      policies: Joi20.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    try {
+      await _add(req.body);
+      res.status(201).json({ message: "Successfully created organization." });
+      return;
+    } catch (error2) {
+      logger26.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getAll(req, res, next) {
+    const validation = Joi20.object({
+      search: Joi20.string().optional().allow("", null),
+      page: Joi20.number().integer().min(1).allow("", null).default(1),
+      limit: Joi20.number().integer().min(1).max(100).allow("", null).default(10),
+      nature: Joi20.string().valid(...allowedNatures).optional().allow("", null),
+      sort: Joi20.string().optional().allow("", null)
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query);
+    if (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    const search = req.query.search ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    const nature = req.query.nature ?? "";
+    try {
+      const data = await _getAll({
+        search,
+        page,
+        limit,
+        nature
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger26.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function addOnboardingOrg(req, res, next) {
+    const validation = Joi20.object({
+      name: Joi20.string().required(),
+      type: Joi20.string().required(),
+      nature: Joi20.string().valid(...allowedNatures).required(),
+      email: Joi20.string().email().optional().allow("", null),
+      contact: Joi20.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    try {
+      const _id = await _add(req.body);
+      const data = await _getById(_id);
+      res.status(201).json({
+        message: "Successfully created organization.",
+        data
+      });
+      return;
+    } catch (error2) {
+      logger26.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getOrgsByUserId(req, res, next) {
+    const validation = Joi20.object({
+      search: Joi20.string().optional().allow("", null),
+      page: Joi20.number().integer().min(1).allow("", null).default(1),
+      limit: Joi20.number().integer().min(1).max(100).allow("", null).default(10),
+      user: Joi20.string().hex().required(),
+      type: Joi20.string().optional().allow("", null)
+    });
+    const query = { ...req.query };
+    query.user = req.params.user;
+    const { error } = validation.validate(query);
+    if (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    const search = req.query.search ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    const user = req.params.user;
+    const type = req.query.type ?? "";
+    try {
+      const data = await getOrgsByMembership({
+        search,
+        page,
+        limit,
+        user,
+        type
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger26.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getByName(req, res, next) {
+    const validation = Joi20.string().required();
+    const name = req.params.name;
+    const { error } = validation.validate(name);
+    if (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    try {
+      const data = await _getByName(name);
+      res.json(data);
+      return;
+    } catch (error2) {
+      next(error2);
+      return;
+    }
+  }
+  async function getById(req, res, next) {
+    const validation = Joi20.string().hex().required();
+    const _id = req.params.id;
+    const { error } = validation.validate(_id);
+    if (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    try {
+      const data = await _getById(_id);
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger26.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getByEmail(req, res, next) {
+    const validation = Joi20.string().required();
+    const email = req.params.email;
+    const { error } = validation.validate(email);
+    if (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    try {
+      const data = await _getByEmail(email);
+      if (!data) {
+        next(new NotFoundError11("Organization not found."));
+        return;
+      }
+      res.json(data);
+      return;
+    } catch (error2) {
+      next(error2);
+      return;
+    }
+  }
+  async function getOrgsByEmail(req, res, next) {
+    const validation = Joi20.object({
+      email: Joi20.string().email().required()
+    });
+    const query = {
+      email: req.params.email
+    };
+    const { error } = validation.validate(query);
+    if (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    const email = req.params.email;
+    try {
+      const data = await _getOrgsByEmail(email);
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger26.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function update(req, res, next) {
+    const validation = Joi20.object({
+      name: Joi20.string().optional(),
+      type: Joi20.string().optional(),
+      nature: Joi20.string().valid(...allowedNatures).optional(),
+      email: Joi20.string().email().allow("", null).optional(),
+      contact: Joi20.string().allow("", null).optional(),
+      terms: Joi20.string().optional().allow("", null),
+      policies: Joi20.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    const id = req.params.id;
+    try {
+      await _update(id, req.body);
+      const data = await _getById(id);
+      res.json({
+        message: "Organization updated successfully",
+        data
+      });
+    } catch (err) {
+      next(err);
+    }
+  }
+  async function getAdminOrgForResident(_req, res, next) {
+    try {
+      const data = await _getAdminOrgForResident();
+      res.status(200).json(data);
+    } catch (error) {
+      logger26.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
+  async function updateStatus(req, res, next) {
+    const validation = Joi20.object({
+      status: Joi20.string().valid("active", "suspended").required()
+    });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      next(new BadRequestError35(error.message));
+      return;
+    }
+    const orgId = req.params.id;
+    const { status } = req.body;
+    try {
+      await _updateStatusById(orgId, status);
+      const subscription = await _getSubscriptionByOrgId(orgId);
+      if (subscription) {
+        await _updateSubscriptionStatusById(
+          subscription._id,
+          status
+        );
+      }
+      const data = await _getById(orgId);
+      res.json({
+        message: "Organization status updated successfully.",
+        data
+      });
+    } catch (err) {
+      next(err);
+    }
+  }
+  return {
+    add,
+    addOnboardingOrg,
+    getAll,
+    getOrgsByUserId,
+    getByName,
+    getById,
+    getByEmail,
+    update,
+    getOrgsByEmail,
+    getAdminOrgForResident,
+    updateStatus
+  };
+}
+
+// src/controllers/organization-v2.controller.ts
+import Joi21 from "joi";
+import { BadRequestError as BadRequestError36, logger as logger27 } from "@7365admin1/node-server-utils";
+function useOrgControllerV2() {
+  const { getAll: _getAll, getOrganizationsWithSubscription: _getOrganizationsWithSubscription } = useOrgRepo();
+  async function getAll(req, res, next) {
+    const validation = Joi21.object({
+      search: Joi21.string().optional().allow("", null),
+      page: Joi21.number().integer().min(1).allow("", null).default(1),
+      limit: Joi21.number().integer().min(1).max(100).allow("", null).default(10),
+      nature: Joi21.string().valid(...allowedNatures).optional().allow("", null),
+      status: Joi21.string().trim().valid("active", "suspended", "deleted").optional().empty("").default("active")
+    });
+    const query = { ...req.query };
+    const { error, value } = validation.validate(query, {
+      convert: true,
+      stripUnknown: true
+    });
+    if (error) {
+      logger27.log({ level: "error", message: error.message });
+      next(new BadRequestError36(error.message));
+      return;
+    }
+    const search = value.search ?? "";
+    const page = typeof value.page === "number" ? value.page : parseInt(String(value.page ?? "1"), 10);
+    const limit = typeof value.limit === "number" ? value.limit : parseInt(String(value.limit ?? "10"), 10);
+    const nature = value.nature ?? "";
+    const status = value.status;
+    try {
+      const data = await _getAll({
+        search,
+        page,
+        limit,
+        nature,
+        status
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger27.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getOrganizationsWithSubscription(req, res, next) {
+    const validation = Joi21.object({
+      search: Joi21.string().optional().allow("", null),
+      page: Joi21.number().integer().min(1).default(1),
+      limit: Joi21.number().integer().min(1).max(100).default(10),
+      status: Joi21.string().trim().valid("active", "suspended", "deleted").default("active"),
+      type: Joi21.string().optional().allow("", null),
+      billingCycle: Joi21.string().optional().allow("", null)
+    });
+    const { error, value } = validation.validate(
+      req.query,
+      {
+        convert: true,
+        stripUnknown: true
+      }
+    );
+    if (error) {
+      next(new BadRequestError36(error.message));
+      return;
+    }
+    try {
+      const data = await _getOrganizationsWithSubscription({
+        search: value.search ?? "",
+        page: value.page ?? 1,
+        limit: value.limit ?? 10,
+        status: value.status ?? "active",
+        type: value.type ?? "",
+        billingCycle: value.billingCycle ?? ""
+      });
+      res.json(data);
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  return {
+    getAll,
+    getOrganizationsWithSubscription
+  };
+}
+
 // src/services/subscription.service.ts
 import {
   AppError as AppError7,
@@ -25378,6 +25440,7 @@ var SortOrder = /* @__PURE__ */ ((SortOrder2) => {
 var BuildingStatus = /* @__PURE__ */ ((BuildingStatus2) => {
   BuildingStatus2["ACTIVE"] = "active";
   BuildingStatus2["PENDING"] = "pending";
+  BuildingStatus2["DELETED"] = "deleted";
   return BuildingStatus2;
 })(BuildingStatus || {});
 var objectIdSchema = Joi41.alternatives().try(
@@ -26738,12 +26801,6 @@ function useVehicleService() {
     const org = await _getById(orgId);
     if (!org)
       throw new BadRequestError75("Org not found");
-    const allowedNatures2 = "property_management_agency" /* PROPERTY_MANAGEMENT_AGENCY */;
-    if (!allowedNatures2.includes(org.nature)) {
-      throw new BadRequestError75(
-        "Only property management can approve vehicles."
-      );
-    }
     const vehicle = await _getVehicleById(id);
     const plate = vehicle.plates.find((p) => p._id.toString() === id);
     const _plateNumber = plate?.plateNumber;
@@ -27966,6 +28023,21 @@ function useBuildingRepo() {
   );
   async function createIndexes() {
     try {
+      const indexes = await collection.indexes();
+      const legacyUniqueIndexKeys = [
+        JSON.stringify({ name: 1 }),
+        JSON.stringify({ site: 1, name: 1 }),
+        JSON.stringify({ site: 1, block: 1 })
+      ];
+      await Promise.all(
+        indexes.map(async (index) => {
+          const key = JSON.stringify(index.key);
+          const isLegacyUniqueIndex = index.unique && legacyUniqueIndexKeys.includes(key) && index.partialFilterExpression?.status !== "active" /* ACTIVE */;
+          if (index.name && isLegacyUniqueIndex) {
+            await collection.dropIndex(index.name);
+          }
+        })
+      );
       await collection.createIndexes([
         { key: { name: "text" }, name: "text-index" },
         // { key: { name: 1 }, unique: true, name: "unique-name-index" },
@@ -27979,6 +28051,14 @@ function useBuildingRepo() {
           partialFilterExpression: {
             status: "active" /* ACTIVE */
           }
+        },
+        {
+          key: { site: 1, name: 1 },
+          unique: true,
+          name: "unique-site-name-active",
+          partialFilterExpression: {
+            status: "active" /* ACTIVE */
+          }
         }
       ]);
     } catch (error) {
@@ -27986,9 +28066,45 @@ function useBuildingRepo() {
     }
   }
   const { getBySiteBuildingLevel: _getBySiteBuildingLevel } = useBuildingUnitRepo();
+  async function assertBuildingDoesNotExist({
+    site,
+    name,
+    block,
+    excludeId,
+    session
+  }) {
+    const duplicates = [];
+    if (name) {
+      duplicates.push({ name });
+    }
+    if (block) {
+      duplicates.push({ block });
+    }
+    if (!duplicates.length) {
+      return;
+    }
+    const existing = await collection.findOne(
+      {
+        site,
+        status: "active" /* ACTIVE */,
+        ...excludeId && { _id: { $ne: excludeId } },
+        $or: duplicates
+      },
+      { session }
+    );
+    if (existing) {
+      throw new BadRequestError80("Building already exists.");
+    }
+  }
   async function add(value, session) {
     try {
       value = MBuilding(value);
+      await assertBuildingDoesNotExist({
+        site: value.site,
+        name: value.name,
+        block: value.block,
+        session
+      });
       const res = await collection.insertOne(value, { session });
       delCachedData();
       return res.insertedId;
@@ -28027,6 +28143,21 @@ function useBuildingRepo() {
           throw new BadRequestError80("Invalid level ID format.");
         }
       }
+      if (value.name || value.block) {
+        const currentBuilding = await collection.findOne(
+          { _id },
+          { session }
+        );
+        if (currentBuilding) {
+          await assertBuildingDoesNotExist({
+            site: currentBuilding.site,
+            name: value.name,
+            block: value.block,
+            excludeId: _id,
+            session
+          });
+        }
+      }
       if (value.name)
         await buildingUnitCollection.updateMany(
           { building: _id, status: "active" /* ACTIVE */ },
@@ -28256,7 +28387,8 @@ function useBuildingRepo() {
     try {
       const res = await collection.updateOne(
         { _id },
-        { $set: { status: "deleted", deletedAt: /* @__PURE__ */ new Date() } }
+        { $set: { status: "deleted" /* DELETED */, deletedAt: /* @__PURE__ */ new Date() } },
+        { session }
       );
       delCachedData();
       return res;
@@ -29165,18 +29297,19 @@ function useBuildingService() {
         }
       }
       const buildingUnitData = {};
-      if (building.name !== data.name) {
+      if (data.name && building.name !== data.name) {
         buildingUnitData.buildingName = data.name;
       }
-      if (building.block !== data.block) {
+      if (data.block && building.block !== data.block) {
         buildingUnitData.block = data.block;
       }
-      await updateByBuildingId(id, buildingUnitData, session);
       if (building.name === data.name) {
         delete data.name;
       }
-      console.log("data", data);
       const result = await _updateById(id, data, session);
+      if (Object.keys(buildingUnitData).length) {
+        await updateByBuildingId(id, buildingUnitData, session);
+      }
       await session.commitTransaction();
       return result;
     } catch (error) {
@@ -57331,7 +57464,7 @@ function useNewDashboardRepo() {
     const periodRange = getDateRange(period);
     const incidentCollection = db.collection(incidents_namespace_collection);
     const visitorCollection = db.collection(visitors_namespace_collection);
-    const nfcPatrolLogCollection = db.collection("nfc-patrol-logs");
+    const patrolLogCollection = db.collection("patrol.logs");
     const [
       workOrderReport,
       yesterdayWorkOrderReport,
@@ -57458,7 +57591,7 @@ function useNewDashboardRepo() {
         checkOut: null,
         status: { $ne: "deleted" }
       }),
-      nfcPatrolLogCollection.aggregate([
+      patrolLogCollection.aggregate([
         {
           $match: {
             site: { $in: [siteIdObj, siteId] },
@@ -57466,23 +57599,23 @@ function useNewDashboardRepo() {
           }
         },
         {
-          $unwind: "$checkPoints"
+          $unwind: "$cameras"
         },
         {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "checkPoints.status": "Completed" } },
+              { $match: { "cameras.status": "Completed" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "checkPoints.status": "Skipped" } },
+              { $match: { "cameras.status": "Skipped" } },
               { $count: "count" }
             ]
           }
         }
       ]).toArray(),
-      nfcPatrolLogCollection.aggregate([
+      patrolLogCollection.aggregate([
         {
           $match: {
             site: { $in: [siteIdObj, siteId] },
@@ -57490,23 +57623,23 @@ function useNewDashboardRepo() {
           }
         },
         {
-          $unwind: "$checkPoints"
+          $unwind: "$cameras"
         },
         {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "checkPoints.status": "Completed" } },
+              { $match: { "cameras.status": "Completed" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "checkPoints.status": "Skipped" } },
+              { $match: { "cameras.status": "Skipped" } },
               { $count: "count" }
             ]
           }
         }
       ]).toArray(),
-      nfcPatrolLogCollection.aggregate([
+      patrolLogCollection.aggregate([
         {
           $match: {
             site: { $in: [siteIdObj, siteId] },
@@ -57514,17 +57647,17 @@ function useNewDashboardRepo() {
           }
         },
         {
-          $unwind: "$checkPoints"
+          $unwind: "$cameras"
         },
         {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "checkPoints.status": "Completed" } },
+              { $match: { "cameras.status": "Completed" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "checkPoints.status": "Skipped" } },
+              { $match: { "cameras.status": "Skipped" } },
               { $count: "count" }
             ]
           }
@@ -57555,78 +57688,127 @@ function useNewDashboardRepo() {
     const tTotal = tPatrolFacet.total[0]?.count ?? 0;
     const tCompleted = tPatrolFacet.completed[0]?.count ?? 0;
     const todayCompliance = tTotal > 0 ? tCompleted / tTotal * 100 : 0;
-    const todayString = moment2.tz("Asia/Singapore").format("YYYY-MM-DD");
-    const dayIndex = moment2.tz("Asia/Singapore").day();
-    const routes = await db.collection("nfc-patrol-routes").find({
-      site: { $in: [siteIdObj, siteId] },
-      days: { $in: [dayIndex] },
-      status: { $ne: "Inactive" }
-    }).toArray();
-    const expandedRoutes = [];
-    for (const route of routes) {
-      if (route.startTimes && Array.isArray(route.startTimes)) {
-        for (const startTime of route.startTimes) {
+    let activePatrolItems = [];
+    if (period === "today" /* TODAY */) {
+      const todayString = moment2.tz("Asia/Singapore").format("YYYY-MM-DD");
+      const dayIndex = moment2.tz("Asia/Singapore").day();
+      const repeatDay = dayIndex === 0 ? 7 : dayIndex;
+      const routes = await db.collection("patrol.route").find({
+        site: { $in: [siteIdObj, siteId] },
+        repeat: { $in: [repeatDay, String(repeatDay)] },
+        status: { $ne: "deleted" }
+      }).toArray();
+      const expandedRoutes = [];
+      for (const route of routes) {
+        if (route.start) {
           expandedRoutes.push({
             route,
-            startTime,
+            startTime: route.start,
             itemIndex: 0
           });
         }
       }
-    }
-    expandedRoutes.sort((a, b) => a.startTime.localeCompare(b.startTime));
-    const limitedRoutes = expandedRoutes.slice(0, 4);
-    limitedRoutes.forEach((item, idx) => {
-      item.itemIndex = idx + 1;
-    });
-    const activePatrolItems = await Promise.all(
-      limitedRoutes.map(async ({ route, startTime, itemIndex }) => {
-        const log = await db.collection("nfc-patrol-logs").findOne({
-          site: { $in: [siteIdObj, siteId] },
-          date: todayString,
-          "route._id": { $in: [route._id, route._id.toString()] },
-          "route.startTime": startTime
-        });
-        let person = "Unassigned";
-        if (log && log.createdBy) {
-          const userDoc = await db.collection("users").findOne({
-            _id: toObjectId16(log.createdBy)
+      expandedRoutes.sort((a, b) => a.startTime.localeCompare(b.startTime));
+      const limitedRoutes = expandedRoutes.slice(0, 4);
+      limitedRoutes.forEach((item, idx) => {
+        item.itemIndex = idx + 1;
+      });
+      activePatrolItems = await Promise.all(
+        limitedRoutes.map(async ({ route, startTime, itemIndex }) => {
+          const log = await db.collection("patrol.logs").findOne({
+            site: { $in: [siteIdObj, siteId] },
+            route: { $in: [route._id, route._id.toString()] },
+            createdAt: { $gte: today, $lte: todayEnd }
           });
-          if (userDoc && userDoc.name) {
-            person = userDoc.name;
+          let person = "Unassigned";
+          if (log && log.assignee && log.assignee.length > 0) {
+            const userIds = log.assignee.map((id) => toObjectId16(id));
+            const userDocs = await db.collection("members").find({ _id: { $in: userIds } }).toArray();
+            if (userDocs && userDocs.length > 0) {
+              person = userDocs.map((u) => u.name || u.email || "").filter(Boolean).join(", ");
+            }
+          } else if (log && log.createdBy) {
+            const userDoc = await db.collection("members").findOne({
+              _id: toObjectId16(log.createdBy)
+            });
+            if (userDoc && userDoc.name) {
+              person = userDoc.name;
+            }
           }
-        }
-        let status = "pending";
-        if (log) {
-          status = "completed";
-        } else {
-          const routeTime = moment2.tz(
-            `${todayString} ${startTime}`,
-            "YYYY-MM-DD HH:mm",
-            "Asia/Singapore"
-          );
-          const nowSg = moment2.tz("Asia/Singapore");
-          const diffMinutes = nowSg.diff(routeTime, "minutes");
-          if (diffMinutes >= 0) {
-            if (diffMinutes <= 120) {
-              status = "on paused";
+          let status = "pending";
+          if (log) {
+            if (log.status) {
+              status = Array.isArray(log.status) ? log.status.join(", ") : log.status;
             } else {
-              status = "incomplete";
+              status = "completed";
             }
           } else {
-            status = "pending";
+            const routeTime = moment2.tz(
+              `${todayString} ${startTime}`,
+              "YYYY-MM-DD HH:mm",
+              "Asia/Singapore"
+            );
+            const nowSg = moment2.tz("Asia/Singapore");
+            const diffMinutes = nowSg.diff(routeTime, "minutes");
+            if (diffMinutes >= 0) {
+              if (diffMinutes <= 120) {
+                status = "on paused";
+              } else {
+                status = "incomplete";
+              }
+            } else {
+              status = "pending";
+            }
           }
-        }
-        return {
-          id: `${route._id.toString()}_${startTime}`,
-          title: route.name,
-          subtitle: `ID${String(itemIndex).padStart(3, "0")}`,
-          person,
-          status,
-          time: startTime
-        };
-      })
-    );
+          return {
+            id: `${route._id.toString()}_${startTime}`,
+            title: route.name,
+            subtitle: `ID${String(itemIndex).padStart(3, "0")}`,
+            person,
+            status,
+            time: startTime
+          };
+        })
+      );
+    } else {
+      const logs = await db.collection("patrol.logs").find({
+        site: { $in: [siteIdObj, siteId] },
+        createdAt: periodRange
+      }).sort({ createdAt: -1 }).limit(4).toArray();
+      activePatrolItems = await Promise.all(
+        logs.map(async (log) => {
+          let person = "Unassigned";
+          if (log.assignee && log.assignee.length > 0) {
+            const userIds = log.assignee.map((id) => toObjectId16(id));
+            const userDocs = await db.collection("members").find({ _id: { $in: userIds } }).toArray();
+            if (userDocs && userDocs.length > 0) {
+              person = userDocs.map((u) => u.name || u.email || "").filter(Boolean).join(", ");
+            }
+          } else if (log.createdBy) {
+            const userDoc = await db.collection("members").findOne({
+              _id: toObjectId16(log.createdBy)
+            });
+            if (userDoc && userDoc.name) {
+              person = userDoc.name;
+            }
+          }
+          let status = "completed";
+          if (log.status) {
+            status = Array.isArray(log.status) ? log.status.join(", ") : log.status;
+          }
+          const logTime = moment2(log.createdAt).tz("Asia/Singapore").format("HH:mm");
+          const logDate = moment2(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
+          return {
+            id: log._id.toString(),
+            title: log.name,
+            subtitle: logDate,
+            person,
+            status,
+            time: logTime
+          };
+        })
+      );
+    }
     const data = {
       openWorkOrder: {
         count: wFacet.total[0]?.count ?? 0,