@goweekdays/core 2.11.14 → 2.11.16

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @goweekdays/core
 
+## 2.11.16
+
+### Patch Changes
+
+- c764e95: Add pilot org invite flow and email template
+
+## 2.11.15
+
+### Patch Changes
+
+- dfa139d: Remove section comments from subscription.service.ts
+
 ## 2.11.14
 
 ### Patch Changes

package/dist/index.d.ts

@@ -374,6 +374,7 @@ type TOrg = {
     deletedAt?: string | Date;
 };
 declare const schemaOrg: Joi.ObjectSchema<any>;
+declare const schemaOrgPilot: Joi.ObjectSchema<any>;
 declare const schemaOrgAdd: Joi.ObjectSchema<any>;
 declare const schemaOrgUpdate: Joi.ObjectSchema<any>;
 declare function modelOrg(value: TOrg): TOrg;
@@ -410,6 +411,13 @@ declare function useOrgService(): {
         paypalOrderLink: any;
     }>;
     addWithVerification: (id: string) => Promise<string>;
+    addPilot: (value: {
+        email: string;
+        name: string;
+        contact: string;
+        createdBy: string;
+        verificationCode: string;
+    }) => Promise<string>;
 };
 
 declare function useOrgController(): {
@@ -420,6 +428,7 @@ declare function useOrgController(): {
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     companySearch: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    addPilot: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TPromo = {
@@ -722,6 +731,7 @@ type TVerificationMetadata = {
     seats?: number;
     createdBy?: string | ObjectId;
     amount?: number;
+    pilot?: boolean;
 };
 type TVerification = {
     _id?: ObjectId;
@@ -734,6 +744,7 @@ type TVerification = {
     expireAt?: string | Date;
 };
 declare const schemaInviteMember: Joi.ObjectSchema<any>;
+declare const schemaVerificationOrgInvite: Joi.ObjectSchema<any>;
 declare const schemaVerification: Joi.ObjectSchema<any>;
 declare function modelVerification(value: TVerification): TVerification;
 
@@ -798,6 +809,10 @@ declare function useVerificationService(): {
     orgSetupFee: (value: TOrg) => Promise<{
         paypalOrderLink: any;
     }>;
+    inviteOrg: (value: {
+        email: string;
+        pilot?: boolean;
+    }) => Promise<string>;
 };
 
 declare function useVerificationController(): {
@@ -811,6 +826,7 @@ declare function useVerificationController(): {
     cancelInviteMember: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     forgetPassword: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     orgSetupFee: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    inviteOrg: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TPlan = {
@@ -1298,4 +1314,4 @@ declare const XENDIT_BASE_URL: string;
 declare const DOMAIN: string;
 declare const APP_ORG: string;
 
-export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, APP_ORG, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MBuilding, MBuildingUnit, MFile, MONGO_DB, MONGO_URI, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PAYPAL_WEBHOOK_ID, PORT, PaypalWebhookHeaders, REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REFRESH_TOKEN_EXPIRY, REFRESH_TOKEN_SECRET, SECRET_KEY, SPACES_ACCESS_KEY, SPACES_BUCKET, SPACES_ENDPOINT, SPACES_REGION, SPACES_SECRET_KEY, TApp, TBuilding, TBuildingUnit, TCounter, TFile, TJobPost, TLedgerBill, TMember, TOrg, TPermission, TPermissionGroup, TPlan, TPromo, TRole, TSubscribe, TSubscription, TSubscriptionTransaction, TUser, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, currencies, isDev, ledgerBillStatuses, ledgerBillTypes, modelApp, modelJobPost, modelLedgerBill, modelMember, modelOrg, modelPermission, modelPermissionGroup, modelPlan, modelPromo, modelRole, modelSubscription, modelSubscriptionTransaction, modelUser, modelVerification, schemaApp, schemaAppUpdate, schemaBuilding, schemaBuildingUnit, schemaInviteMember, schemaJobPost, schemaJobPostUpdate, schemaLedgerBill, schemaLedgerBillingSummary, schemaMember, schemaMemberRole, schemaMemberStatus, schemaOrg, schemaOrgAdd, schemaOrgUpdate, schemaPermission, schemaPermissionGroup, schemaPermissionGroupUpdate, schemaPermissionUpdate, schemaPlan, schemaPromo, schemaRole, schemaRoleUpdate, schemaSubscribe, schemaSubscription, schemaSubscriptionCompute, schemaSubscriptionPromoCode, schemaSubscriptionSeats, schemaSubscriptionTransaction, schemaSubscriptionUpdate, schemaUpdateOptions, schemaUser, schemaVerification, transactionSchema, useAppController, useAppRepo, useAppService, useAuthController, useAuthService, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCounterModel, useCounterRepo, useFileController, useFileRepo, useFileService, useGitHubService, useJobPostController, useJobPostRepo, useJobPostService, useLedgerBillingController, useLedgerBillingRepo, useMemberController, useMemberRepo, useOrgController, useOrgRepo, useOrgService, usePaypalService, usePermissionController, usePermissionGroupController, usePermissionGroupRepo, usePermissionGroupService, usePermissionRepo, usePermissionService, usePlanController, usePlanRepo, usePlanService, usePromoController, usePromoRepo, usePromoUsageRepo, useRoleController, useRoleRepo, useRoleService, useSubscriptionController, useSubscriptionRepo, useSubscriptionService, useSubscriptionTransactionController, useSubscriptionTransactionRepo, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService };
+export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, APP_ORG, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MBuilding, MBuildingUnit, MFile, MONGO_DB, MONGO_URI, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PAYPAL_WEBHOOK_ID, PORT, PaypalWebhookHeaders, REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REFRESH_TOKEN_EXPIRY, REFRESH_TOKEN_SECRET, SECRET_KEY, SPACES_ACCESS_KEY, SPACES_BUCKET, SPACES_ENDPOINT, SPACES_REGION, SPACES_SECRET_KEY, TApp, TBuilding, TBuildingUnit, TCounter, TFile, TJobPost, TLedgerBill, TMember, TOrg, TPermission, TPermissionGroup, TPlan, TPromo, TRole, TSubscribe, TSubscription, TSubscriptionTransaction, TUser, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, currencies, isDev, ledgerBillStatuses, ledgerBillTypes, modelApp, modelJobPost, modelLedgerBill, modelMember, modelOrg, modelPermission, modelPermissionGroup, modelPlan, modelPromo, modelRole, modelSubscription, modelSubscriptionTransaction, modelUser, modelVerification, schemaApp, schemaAppUpdate, schemaBuilding, schemaBuildingUnit, schemaInviteMember, schemaJobPost, schemaJobPostUpdate, schemaLedgerBill, schemaLedgerBillingSummary, schemaMember, schemaMemberRole, schemaMemberStatus, schemaOrg, schemaOrgAdd, schemaOrgPilot, schemaOrgUpdate, schemaPermission, schemaPermissionGroup, schemaPermissionGroupUpdate, schemaPermissionUpdate, schemaPlan, schemaPromo, schemaRole, schemaRoleUpdate, schemaSubscribe, schemaSubscription, schemaSubscriptionCompute, schemaSubscriptionPromoCode, schemaSubscriptionSeats, schemaSubscriptionTransaction, schemaSubscriptionUpdate, schemaUpdateOptions, schemaUser, schemaVerification, schemaVerificationOrgInvite, transactionSchema, useAppController, useAppRepo, useAppService, useAuthController, useAuthService, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCounterModel, useCounterRepo, useFileController, useFileRepo, useFileService, useGitHubService, useJobPostController, useJobPostRepo, useJobPostService, useLedgerBillingController, useLedgerBillingRepo, useMemberController, useMemberRepo, useOrgController, useOrgRepo, useOrgService, usePaypalService, usePermissionController, usePermissionGroupController, usePermissionGroupRepo, usePermissionGroupService, usePermissionRepo, usePermissionService, usePlanController, usePlanRepo, usePlanService, usePromoController, usePromoRepo, usePromoUsageRepo, useRoleController, useRoleRepo, useRoleService, useSubscriptionController, useSubscriptionRepo, useSubscriptionService, useSubscriptionTransactionController, useSubscriptionTransactionRepo, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService };

package/dist/index.js

@@ -102,6 +102,7 @@ __export(src_exports, {
   schemaMemberStatus: () => schemaMemberStatus,
   schemaOrg: () => schemaOrg,
   schemaOrgAdd: () => schemaOrgAdd,
+  schemaOrgPilot: () => schemaOrgPilot,
   schemaOrgUpdate: () => schemaOrgUpdate,
   schemaPermission: () => schemaPermission,
   schemaPermissionGroup: () => schemaPermissionGroup,
@@ -121,6 +122,7 @@ __export(src_exports, {
   schemaUpdateOptions: () => schemaUpdateOptions,
   schemaUser: () => schemaUser,
   schemaVerification: () => schemaVerification,
+  schemaVerificationOrgInvite: () => schemaVerificationOrgInvite,
   transactionSchema: () => transactionSchema,
   useAppController: () => useAppController,
   useAppRepo: () => useAppRepo,
@@ -674,6 +676,10 @@ var schemaInviteMember = import_joi2.default.object({
   app: import_joi2.default.string().required(),
   org: import_joi2.default.string().hex().optional().allow("", null)
 });
+var schemaVerificationOrgInvite = import_joi2.default.object({
+  email: import_joi2.default.string().email().required(),
+  pilot: import_joi2.default.boolean().optional()
+});
 var schemaVerification = import_joi2.default.object({
   type: import_joi2.default.string().required(),
   email: import_joi2.default.string().email().required(),
@@ -688,7 +694,8 @@ var schemaVerification = import_joi2.default.object({
     contact: import_joi2.default.string().optional().allow("", null),
     seats: import_joi2.default.number().optional().allow("", null),
     createdBy: import_joi2.default.string().optional().allow("", null),
-    amount: import_joi2.default.number().optional().allow("", null)
+    amount: import_joi2.default.number().optional().allow("", null),
+    pilot: import_joi2.default.boolean().optional().allow("", null)
   }).optional(),
   expireAt: import_joi2.default.date().optional().allow("", null)
 });
@@ -4492,13 +4499,17 @@ var schema = {
   name: import_joi15.default.string().max(255).required(),
   description: import_joi15.default.string().max(1024).optional().allow("", null),
   email: import_joi15.default.string().email().max(255).required(),
-  contact: import_joi15.default.string().max(50).optional().allow("", null),
-  promoCode: import_joi15.default.string().max(50).optional().allow("", null)
+  contact: import_joi15.default.string().max(50).optional().allow("", null)
 };
 var schemaOrg = import_joi15.default.object({
   ...schema,
   createdBy: import_joi15.default.string().hex().required()
 });
+var schemaOrgPilot = import_joi15.default.object({
+  ...schema,
+  createdBy: import_joi15.default.string().hex().required(),
+  verificationCode: import_joi15.default.string().hex().required()
+});
 var schemaOrgAdd = import_joi15.default.object({
   ...schema,
   createdBy: import_joi15.default.string().hex().required()
@@ -9305,7 +9316,8 @@ function useVerificationController() {
     signUp: _signUp,
     cancelInviteMember: _cancelInviteMember,
     forgetPassword: _forgetPassword,
-    orgSetupFee: _orgSetupFee
+    orgSetupFee: _orgSetupFee,
+    inviteOrg: _inviteOrg
   } = useVerificationService();
   const { getVerifications: _getVerifications } = useVerificationRepo();
   async function createUserInvite(req, res, next) {
@@ -9526,6 +9538,20 @@ function useVerificationController() {
       next(error2);
     }
   }
+  async function inviteOrg(req, res, next) {
+    const value = req.body;
+    const { error } = schemaVerificationOrgInvite.validate(value);
+    if (error) {
+      next(new import_utils48.BadRequestError(error.message));
+    }
+    try {
+      const message = await _inviteOrg(value);
+      res.json({ message });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     getVerifications,
     createUserInvite,
@@ -9536,7 +9562,8 @@ function useVerificationController() {
     signUp,
     cancelInviteMember,
     forgetPassword,
-    orgSetupFee
+    orgSetupFee,
+    inviteOrg
   };
 }
 
@@ -9691,7 +9718,6 @@ function useOrgService() {
     try {
       session?.startTransaction();
       const verification = await getById(id);
-      await updateVerificationStatus(id, "complete", session);
       if (!verification) {
         throw new import_utils49.BadRequestError("Verification not found.");
       }
@@ -9704,6 +9730,10 @@ function useOrgService() {
       if (!verification.metadata?.contact) {
         throw new import_utils49.BadRequestError("Contact is required.");
       }
+      if (verification.type !== "org-setup-fee") {
+        throw new import_utils49.BadRequestError("Invalid verification type.");
+      }
+      await updateVerificationStatus(id, "complete", session);
       const org = await addOrg(
         {
           email: verification.email,
@@ -9805,9 +9835,125 @@ function useOrgService() {
       await session?.endSession();
     }
   }
+  async function addPilot(value) {
+    const { error } = schemaOrgPilot.validate(value);
+    if (error) {
+      throw new import_utils49.BadRequestError(error.message);
+    }
+    const session = import_utils49.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new import_utils49.BadRequestError("Unable to start database session.");
+    }
+    try {
+      session?.startTransaction();
+      const verification = await getById(value.verificationCode);
+      if (!verification) {
+        throw new import_utils49.BadRequestError("Verification not found.");
+      }
+      if (verification.type !== "org-invite") {
+        throw new import_utils49.BadRequestError("Invalid verification type.");
+      }
+      if (verification.metadata && !verification.metadata.pilot) {
+        throw new import_utils49.BadRequestError("Not a pilot invitation.");
+      }
+      await updateVerificationStatus(
+        value.verificationCode,
+        "complete",
+        session
+      );
+      const org = await addOrg(
+        {
+          email: value.email,
+          name: value.name,
+          contact: value.contact,
+          createdBy: value.createdBy
+        },
+        session
+      );
+      const plan = await getDefault();
+      if (!plan) {
+        throw new import_utils49.BadRequestError(
+          "Failed to create organization, plan not found."
+        );
+      }
+      const currentDate = /* @__PURE__ */ new Date();
+      const nextBillingDate = new Date(currentDate);
+      nextBillingDate.setMonth(currentDate.getMonth() + 1);
+      const createdBy = String(value.createdBy);
+      const user = await getUserById(createdBy);
+      if (!user) {
+        throw new import_utils49.BadRequestError("User is required to create org member.");
+      }
+      const allPermissions = await getAllPermission({
+        app: "org",
+        limit: 100
+      });
+      let permissions = [];
+      if (allPermissions && allPermissions.items && allPermissions.items.length) {
+        permissions = allPermissions.items.map((perm) => perm.key);
+      }
+      if (permissions.length === 0) {
+        throw new Error("No permissions found for the organization type.");
+      }
+      const roleData = {
+        org: String(org),
+        name: "Owner",
+        description: "Owner of the organization",
+        permissions,
+        createdBy,
+        app: "org"
+      };
+      const role = await addRole(roleData, session);
+      if (!role) {
+        throw new import_utils49.BadRequestError("Role is required to create org member.");
+      }
+      await addMember(
+        {
+          role: String(role),
+          roleName: roleData.name,
+          org: String(org),
+          orgName: value.name,
+          name: `${user.firstName} ${user.lastName}`,
+          user: createdBy,
+          app: "org"
+        },
+        session
+      );
+      const filePath = (0, import_utils49.getDirectory)(
+        __dirname,
+        "./public/handlebars/org-created"
+      );
+      const emailContent = (0, import_utils49.compileHandlebar)({
+        context: {
+          app: APP_ORG,
+          organization_name: value.name
+        },
+        filePath
+      });
+      mailer.sendMail({
+        to: verification.email,
+        subject: "Welcome to GoWeekdays - Your Organization is Ready",
+        html: emailContent,
+        from: "GoWeekdays"
+      }).catch((error2) => {
+        import_utils49.logger.log({
+          level: "error",
+          message: `Error sending user invite email: ${error2}`
+        });
+      });
+      await session?.commitTransaction();
+      return "Successfully created organization with verification.";
+    } catch (error2) {
+      await session?.abortTransaction();
+      throw error2;
+    } finally {
+      await session?.endSession();
+    }
+  }
   return {
     add,
-    addWithVerification
+    addWithVerification,
+    addPilot
   };
 }
 
@@ -9824,6 +9970,7 @@ function useOrgController() {
     updateById: _updateById,
     companySearch: _companySearch
   } = useOrgRepo();
+  const { addPilot: _addPilot } = useOrgService();
   async function add(req, res, next) {
     const value = req.body;
     const { error } = schemaOrgAdd.validate(value);
@@ -9842,6 +9989,24 @@ function useOrgController() {
       next(error2);
     }
   }
+  async function addPilot(req, res, next) {
+    const value = req.body;
+    const { error } = schemaOrgPilot.validate(value);
+    if (error) {
+      next(new import_utils50.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _addPilot(value);
+      res.json({
+        message: "Organization created successfully.",
+        data
+      });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   async function getOrgsByUserId(req, res, next) {
     const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
     const limit = typeof req.query.limit === "string" ? Number(req.query.limit) : 10;
@@ -9985,7 +10150,8 @@ function useOrgController() {
     getAll,
     getById,
     updateById,
-    companySearch
+    companySearch,
+    addPilot
   };
 }
 
@@ -10410,7 +10576,8 @@ function useUserController() {
     const id = req.params.id || "";
     const validation = import_joi43.default.string().hex().validate(id);
     if (validation.error) {
-      throw new import_utils52.BadRequestError("Invalid id.");
+      next(new import_utils52.BadRequestError("Invalid user ID."));
+      return;
     }
     try {
       const user = await _getUserById(id);
@@ -11142,12 +11309,79 @@ function useVerificationService() {
         paypalOrderLink: paypalOrderLink ? paypalOrderLink.href : ""
       };
     } catch (error) {
+      import_utils53.logger.log({
+        level: "error",
+        message: `Error processing organization setup fee: ${error}`
+      });
+      await session?.abortTransaction();
       if (error instanceof import_utils53.AppError) {
         throw error;
       }
       throw new import_utils53.InternalServerError(
         "Failed to process organization setup fee."
       );
+    } finally {
+      session?.endSession();
+    }
+  }
+  async function inviteOrg(value) {
+    const { error } = schemaVerificationOrgInvite.validate(value);
+    if (error) {
+      throw new import_utils53.BadRequestError(error.message);
+    }
+    const session = import_utils53.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new import_utils53.BadRequestError("Unable to start database session.");
+    }
+    try {
+      session.startTransaction();
+      const orgExistingByEmail = await getOrgByEmail(value.email);
+      if (orgExistingByEmail) {
+        throw new import_utils53.BadRequestError(`Email ${value.email} is already taken.`);
+      }
+      const verificationId = await add(
+        {
+          type: "org-invite",
+          email: value.email,
+          metadata: {
+            pilot: value.pilot
+          }
+        },
+        session
+      );
+      const filePath = (0, import_utils53.getDirectory)(
+        __dirname,
+        "./public/handlebars/org-invite"
+      );
+      const emailContent = (0, import_utils53.compileHandlebar)({
+        context: {
+          validity: VERIFICATION_USER_INVITE_DURATION,
+          link: `${APP_ORG}/organizations/create?invite=${verificationId}`
+        },
+        filePath
+      });
+      await mailer.sendMail({
+        to: value.email,
+        subject: value.pilot ? "Pilot Organization Invitation" : "Organization Invitation",
+        html: emailContent,
+        from: "GoWeekdays"
+      });
+      await session?.commitTransaction();
+      return "Successfully created organization invite.";
+    } catch (error2) {
+      import_utils53.logger.log({
+        level: "error",
+        message: `Error inviting organization: ${error2}`
+      });
+      await session?.abortTransaction();
+      if (error2 instanceof import_utils53.AppError) {
+        throw error2;
+      }
+      throw new import_utils53.InternalServerError(
+        "Failed to process organization setup fee."
+      );
+    } finally {
+      session?.endSession();
     }
   }
   return {
@@ -11162,7 +11396,8 @@ function useVerificationService() {
     inviteMember,
     cancelInviteMember,
     forgetPassword,
-    orgSetupFee
+    orgSetupFee,
+    inviteOrg
   };
 }
 
@@ -13678,6 +13913,7 @@ function useJobPostController() {
   schemaMemberStatus,
   schemaOrg,
   schemaOrgAdd,
+  schemaOrgPilot,
   schemaOrgUpdate,
   schemaPermission,
   schemaPermissionGroup,
@@ -13697,6 +13933,7 @@ function useJobPostController() {
   schemaUpdateOptions,
   schemaUser,
   schemaVerification,
+  schemaVerificationOrgInvite,
   transactionSchema,
   useAppController,
   useAppRepo,