@goweekdays/core 2.15.2 → 2.15.4

package/dist/index.mjs

@@ -11021,8 +11021,8 @@ function useOrgService() {
       mailer.sendMail({
         to: verification.email,
         subject: "Welcome to GoWeekdays - Your Organization is Ready",
-        html: emailContent,
-        from: "GoWeekdays"
+        from: `"GoWeekdays" <support@goweekdays.com>`,
+        html: emailContent
       }).catch((error2) => {
         logger28.log({
           level: "error",
@@ -11158,8 +11158,8 @@ function useOrgService() {
       mailer.sendMail({
         to: verification.email,
         subject: "Welcome to GoWeekdays - Your Organization is Ready",
-        html: emailContent,
-        from: "GoWeekdays"
+        from: `"GoWeekdays" <support@goweekdays.com>`,
+        html: emailContent
       }).catch((error2) => {
         logger28.log({
           level: "error",
@@ -12072,7 +12072,7 @@ function useVerificationService() {
           to: email,
           subject: "Member Invite",
           html: emailContent2,
-          from: "GoWeekdays"
+          from: `"GoWeekdays" <support@goweekdays.com>`
         }).catch((error) => {
           logger30.log({
             level: "error",
@@ -12094,7 +12094,7 @@ function useVerificationService() {
         to: email,
         subject: "User Invite",
         html: emailContent,
-        from: "GoWeekdays"
+        from: `"GoWeekdays" <support@goweekdays.com>`
       }).catch((error) => {
         logger30.log({
           level: "error",
@@ -12128,7 +12128,7 @@ function useVerificationService() {
       mailer.sendMail({
         to: email,
         subject: "Forget Password",
-        from: "GoWeekdays",
+        from: `"GoWeekdays" <support@goweekdays.com>`,
         html: emailContent
       }).catch((error) => {
         logger30.log({
@@ -12319,7 +12319,7 @@ function useVerificationService() {
         to: email,
         subject: "Sign Up Verification",
         html: emailContent,
-        from: "GoWeekdays"
+        from: `"GoWeekdays" <support@goweekdays.com>`
       }).catch((error) => {
         logger30.log({
           level: "error",
@@ -12411,7 +12411,7 @@ function useVerificationService() {
           to: value.email,
           subject: "Member Invite",
           html: emailContent2,
-          from: "GoWeekdays"
+          from: `"GoWeekdays" <support@goweekdays.com>`
         }).catch((error2) => {
           logger30.log({
             level: "error",
@@ -12433,7 +12433,7 @@ function useVerificationService() {
         to: value.email,
         subject: "User Invite",
         html: emailContent,
-        from: "GoWeekdays"
+        from: `"GoWeekdays" <support@goweekdays.com>`
       }).catch((error2) => {
         logger30.log({
           level: "error",
@@ -12501,16 +12501,11 @@ function useVerificationService() {
         },
         filePath
       });
-      mailer.sendMail({
+      await mailer.sendMail({
         to: email,
         subject: "Forget Password",
-        from: "GoWeekdays",
+        from: `"GoWeekdays" <support@goweekdays.com>`,
         html: emailContent
-      }).catch((error2) => {
-        logger30.log({
-          level: "error",
-          message: `Error sending forget password email: ${error2}`
-        });
       });
       return "Successfully created a link to reset password. Please check your email.";
     } catch (error2) {
@@ -12625,7 +12620,7 @@ function useVerificationService() {
         to: value.email,
         subject: value.pilot ? "Pilot Organization Invitation" : "Organization Invitation",
         html: emailContent,
-        from: "GoWeekdays"
+        from: `"GoWeekdays" <support@goweekdays.com>`
       });
       await session?.commitTransaction();
       return "Successfully created organization invite.";
@@ -18701,6 +18696,242 @@ function useChartOfAccountRepo() {
       throw new InternalServerError38("Failed to update children count.");
     }
   }
+  async function getTrialBalance(options) {
+    options.page = options.page && options.page > 0 ? options.page - 1 : 0;
+    options.limit = options.limit ?? 10;
+    try {
+      options.org = new ObjectId47(options.org);
+    } catch (error) {
+      throw new BadRequestError88("Invalid organization ID.");
+    }
+    const cacheKey = makeCacheKey27(namespace_collection, {
+      org: String(options.org),
+      fiscalYear: options.fiscalYear,
+      from: options.from ?? "",
+      to: options.to ?? "",
+      limit: options.limit,
+      page: options.page
+    });
+    logger45.log({
+      level: "info",
+      message: `Cache key for getTrialBalance: ${cacheKey}`
+    });
+    try {
+      const cachedData = await repo.getCache(cacheKey);
+      if (cachedData) {
+        logger45.log({
+          level: "info",
+          message: `Cache hit for getTrialBalance: ${cacheKey}`
+        });
+        return cachedData;
+      }
+      const query = {
+        org: options.org,
+        status: "active",
+        childrenCount: 0
+      };
+      const pipeline = [
+        { $eq: ["$account", "$$account"] },
+        { $eq: ["$period.fiscalYear", options.fiscalYear] }
+      ];
+      if (options.from !== void 0) {
+        pipeline.push({ $gte: ["$period.fiscalMonth", options.from] });
+      }
+      if (options.to !== void 0) {
+        pipeline.push({ $lte: ["$period.fiscalMonth", options.to] });
+      }
+      const accounts = await repo.collection.aggregate([
+        {
+          $match: query
+        },
+        { $sort: { path: 1 } },
+        {
+          $skip: options.page * options.limit
+        },
+        {
+          $limit: options.limit
+        },
+        {
+          $lookup: {
+            from: "finance.account.balances",
+            let: {
+              account: "$_id"
+            },
+            pipeline: [
+              {
+                $match: {
+                  $expr: {
+                    $and: pipeline
+                  }
+                }
+              },
+              {
+                $group: {
+                  _id: "$account",
+                  debit: {
+                    $sum: "$closingDebit"
+                  },
+                  credit: {
+                    $sum: "$closingCredit"
+                  }
+                }
+              }
+            ],
+            as: "balance"
+          }
+        },
+        {
+          $unwind: {
+            path: "$balance",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $project: {
+            name: 1,
+            code: 1,
+            type: 1,
+            debit: { $ifNull: ["$balance.debit", 0] },
+            credit: { $ifNull: ["$balance.credit", 0] }
+          }
+        },
+        {
+          $match: {
+            $or: [{ debit: { $ne: 0 } }, { credit: { $ne: 0 } }]
+          }
+        }
+      ]).toArray();
+      const length = await repo.collection.countDocuments(query);
+      const data = paginate23(accounts, options.page, options.limit, length);
+      repo.setCache(cacheKey, data, 300).then(() => {
+        logger45.log({
+          level: "info",
+          message: `Cache set for getTrialBalance: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger45.log({
+          level: "error",
+          message: `Failed to set cache for getTrialBalance: ${err.message}`
+        });
+      });
+      return data;
+    } catch (error) {
+      logger45.log({
+        level: "error",
+        message: `Error in getTrialBalance: ${error}`
+      });
+      throw new InternalServerError38("Failed to get trial balance.");
+    }
+  }
+  async function getBalanceSheet(options) {
+    options.page = options.page && options.page > 0 ? options.page - 1 : 0;
+    options.limit = options.limit ?? 10;
+    try {
+      options.org = new ObjectId47(options.org);
+    } catch (error) {
+      throw new BadRequestError88("Invalid organization ID.");
+    }
+    const cacheKey = makeCacheKey27(namespace_collection, {
+      type: "balance-sheet",
+      org: String(options.org),
+      fiscalYear: options.fiscalYear,
+      from: options.from ?? "",
+      to: options.to ?? "",
+      limit: options.limit,
+      page: options.page
+    });
+    try {
+      const cachedData = await repo.getCache(cacheKey);
+      if (cachedData) {
+        return cachedData;
+      }
+      const query = {
+        org: options.org,
+        status: "active",
+        childrenCount: 0
+      };
+      const pipeline = [
+        { $eq: ["$account", "$$account"] },
+        { $eq: ["$period.fiscalYear", options.fiscalYear] }
+      ];
+      if (options.from !== void 0) {
+        pipeline.push({ $gte: ["$period.fiscalMonth", options.from] });
+      }
+      if (options.to !== void 0) {
+        pipeline.push({ $lte: ["$period.fiscalMonth", options.to] });
+      }
+      const accounts = await repo.collection.aggregate([
+        { $match: query },
+        { $sort: { path: 1 } },
+        { $skip: options.page * options.limit },
+        { $limit: options.limit },
+        {
+          $lookup: {
+            from: "finance.account.balances",
+            let: { account: "$_id" },
+            pipeline: [
+              {
+                $match: {
+                  $expr: { $and: pipeline }
+                }
+              },
+              {
+                $group: {
+                  _id: "$account",
+                  debit: { $sum: "$closingDebit" },
+                  credit: { $sum: "$closingCredit" }
+                }
+              }
+            ],
+            as: "balance"
+          }
+        },
+        {
+          $unwind: {
+            path: "$balance",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $project: {
+            name: 1,
+            code: 1,
+            type: 1,
+            normalBalance: 1,
+            isContra: 1,
+            parent: 1,
+            childrenCount: 1,
+            debit: { $ifNull: ["$balance.debit", 0] },
+            credit: { $ifNull: ["$balance.credit", 0] }
+          }
+        },
+        {
+          $match: {
+            $or: [
+              { childrenCount: { $gt: 0 } },
+              { debit: { $ne: 0 } },
+              { credit: { $ne: 0 } }
+            ]
+          }
+        }
+      ]).toArray();
+      const length = await repo.collection.countDocuments(query);
+      const data = paginate23(accounts, options.page, options.limit, length);
+      repo.setCache(cacheKey, data, 300).catch((err) => {
+        logger45.log({
+          level: "error",
+          message: `Failed to set cache for getBalanceSheet: ${err.message}`
+        });
+      });
+      return data;
+    } catch (error) {
+      logger45.log({
+        level: "error",
+        message: `Error in getBalanceSheet: ${error}`
+      });
+      throw new InternalServerError38("Failed to get balance sheet data.");
+    }
+  }
   return {
     createIndexes,
     add,
@@ -18711,7 +18942,9 @@ function useChartOfAccountRepo() {
     deleteById,
     updateStatusById,
     countByPath,
-    updateChildrenCountById
+    updateChildrenCountById,
+    getTrialBalance,
+    getBalanceSheet
   };
 }
 
@@ -18729,7 +18962,9 @@ function useChartOfAccountService() {
     updateById: _updateById,
     deleteById: _deleteById,
     countByPath,
-    updateChildrenCountById
+    updateChildrenCountById,
+    getTrialBalance: _getTrialBalance,
+    getBalanceSheet: _getBalanceSheet
   } = useChartOfAccountRepo();
   async function add(value) {
     const { error } = schemaChartOfAccountBase.validate(value);
@@ -18870,10 +19105,112 @@ function useChartOfAccountService() {
       session.endSession();
     }
   }
+  async function getTrialBalance(options) {
+    const LIMIT = 100;
+    const allAccounts = [];
+    let page = 1;
+    let totalPages = 1;
+    do {
+      const result = await _getTrialBalance({
+        org: options.org,
+        fiscalYear: options.fiscalYear,
+        from: options.from,
+        to: options.to,
+        page,
+        limit: LIMIT
+      });
+      allAccounts.push(...result.items);
+      totalPages = result.pages;
+      page++;
+    } while (page <= totalPages);
+    return allAccounts;
+  }
+  async function getBalanceSheet(options) {
+    const LIMIT = 100;
+    const allAccounts = [];
+    let page = 1;
+    let totalPages = 1;
+    do {
+      const result = await _getBalanceSheet({
+        org: options.org,
+        fiscalYear: options.fiscalYear,
+        from: options.from,
+        to: options.to,
+        page,
+        limit: LIMIT
+      });
+      allAccounts.push(...result.items);
+      totalPages = result.pages;
+      page++;
+    } while (page <= totalPages);
+    const netBalance = (a) => a.normalBalance === "debit" ? a.debit - a.credit : a.credit - a.debit;
+    const section = (type) => {
+      const accounts = allAccounts.filter((a) => a.type === type).map((a) => ({ ...a, balance: netBalance(a) }));
+      const total = accounts.reduce((sum, a) => sum + a.balance, 0);
+      return { accounts, total };
+    };
+    const assets = section("asset");
+    const liabilities = section("liability");
+    const equity = section("equity");
+    const incomeTotal = allAccounts.filter((a) => a.type === "income").reduce((sum, a) => sum + netBalance(a), 0);
+    const expenseTotal = allAccounts.filter((a) => a.type === "expense").reduce((sum, a) => sum + netBalance(a), 0);
+    const netIncome = incomeTotal - expenseTotal;
+    const totalEquity = equity.total + netIncome;
+    const totalLiabilitiesAndEquity = liabilities.total + totalEquity;
+    return {
+      assets: assets.accounts,
+      liabilities: liabilities.accounts,
+      equity: equity.accounts,
+      netIncome,
+      totalAssets: assets.total,
+      totalLiabilities: liabilities.total,
+      totalEquity,
+      totalLiabilitiesAndEquity,
+      isBalanced: assets.total === totalLiabilitiesAndEquity
+    };
+  }
+  async function getIncomeStatement(options) {
+    const LIMIT = 100;
+    const allAccounts = [];
+    let page = 1;
+    let totalPages = 1;
+    do {
+      const result = await _getBalanceSheet({
+        org: options.org,
+        fiscalYear: options.fiscalYear,
+        from: options.from,
+        to: options.to,
+        page,
+        limit: LIMIT
+      });
+      allAccounts.push(...result.items);
+      totalPages = result.pages;
+      page++;
+    } while (page <= totalPages);
+    const netBalance = (a) => a.normalBalance === "debit" ? a.debit - a.credit : a.credit - a.debit;
+    const section = (type) => {
+      const accounts = allAccounts.filter((a) => a.type === type).map((a) => ({ ...a, balance: netBalance(a) }));
+      const total = accounts.reduce((sum, a) => sum + a.balance, 0);
+      return { accounts, total };
+    };
+    const revenues = section("income");
+    const expenses = section("expense");
+    const netIncome = revenues.total - expenses.total;
+    return {
+      revenues: revenues.accounts,
+      expenses: expenses.accounts,
+      totalRevenues: revenues.total,
+      totalExpenses: expenses.total,
+      netIncome
+    };
+  }
   return {
     add,
     updateById,
-    deleteById
+    deleteById,
+    getTrialBalance,
+    getBalanceSheet,
+    getIncomeStatement
   };
 }
 
@@ -18888,7 +19225,10 @@ function useChartOfAccountController() {
   const {
     add: _add,
     updateById: _updateById,
-    deleteById: _deleteById
+    deleteById: _deleteById,
+    getTrialBalance: _getTrialBalance,
+    getBalanceSheet: _getBalanceSheet,
+    getIncomeStatement: _getIncomeStatement
   } = useChartOfAccountService();
   async function add(req, res, next) {
     const value = req.body;
@@ -19044,6 +19384,75 @@ function useChartOfAccountController() {
       next(error);
     }
   }
+  async function getTrialBalance(req, res, next) {
+    const org = req.params.org ?? "";
+    const fiscalYear = typeof req.params.fiscalYear === "string" ? Number(req.params.fiscalYear) : NaN;
+    const from = typeof req.query.from === "string" ? Number(req.query.from) : NaN;
+    const to = typeof req.query.to === "string" ? Number(req.query.to) : NaN;
+    const validation = Joi80.object({
+      org: Joi80.string().hex().required(),
+      fiscalYear: Joi80.number().required(),
+      from: Joi80.number().optional().allow("", null),
+      to: Joi80.number().optional().allow("", null)
+    });
+    const { error } = validation.validate({ ...req.params, ...req.query });
+    if (error) {
+      next(new BadRequestError90(error.message));
+      return;
+    }
+    try {
+      const accounts = await _getTrialBalance({ org, fiscalYear, from, to });
+      res.json(accounts);
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getBalanceSheet(req, res, next) {
+    const org = req.params.org ?? "";
+    const fiscalYear = typeof req.params.fiscalYear === "string" ? Number(req.params.fiscalYear) : NaN;
+    const from = typeof req.query.from === "string" ? Number(req.query.from) : void 0;
+    const to = typeof req.query.to === "string" ? Number(req.query.to) : void 0;
+    const validation = Joi80.object({
+      org: Joi80.string().hex().required(),
+      fiscalYear: Joi80.number().required(),
+      from: Joi80.number().optional().allow("", null),
+      to: Joi80.number().optional().allow("", null)
+    });
+    const { error } = validation.validate({ ...req.params, ...req.query });
+    if (error) {
+      next(new BadRequestError90(error.message));
+      return;
+    }
+    try {
+      const data = await _getBalanceSheet({ org, fiscalYear, from, to });
+      res.json(data);
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getIncomeStatement(req, res, next) {
+    const org = req.params.org ?? "";
+    const fiscalYear = typeof req.params.fiscalYear === "string" ? Number(req.params.fiscalYear) : NaN;
+    const from = typeof req.query.from === "string" ? Number(req.query.from) : void 0;
+    const to = typeof req.query.to === "string" ? Number(req.query.to) : void 0;
+    const validation = Joi80.object({
+      org: Joi80.string().hex().required(),
+      fiscalYear: Joi80.number().required(),
+      from: Joi80.number().optional().allow("", null),
+      to: Joi80.number().optional().allow("", null)
+    });
+    const { error } = validation.validate({ ...req.params, ...req.query });
+    if (error) {
+      next(new BadRequestError90(error.message));
+      return;
+    }
+    try {
+      const data = await _getIncomeStatement({ org, fiscalYear, from, to });
+      res.json(data);
+    } catch (error2) {
+      next(error2);
+    }
+  }
   async function updateStatusById(req, res, next) {
     const id = req.params.id;
     const status2 = req.params.status;
@@ -19071,7 +19480,10 @@ function useChartOfAccountController() {
     getById,
     updateById,
     deleteById,
-    updateStatusById
+    updateStatusById,
+    getTrialBalance,
+    getBalanceSheet,
+    getIncomeStatement
   };
 }
 
@@ -19085,7 +19497,9 @@ var schemaAccountBalance = Joi81.object({
   accountType: Joi81.string().required(),
   period: Joi81.object({
     fiscalYear: Joi81.number().required(),
-    month: Joi81.string().required()
+    fiscalMonth: Joi81.number().min(1).max(12).required(),
+    year: Joi81.number().required(),
+    month: Joi81.number().min(1).max(12).required()
   }).required(),
   openingDebit: Joi81.number().required(),
   openingCredit: Joi81.number().required(),
@@ -19150,10 +19564,18 @@ function useAccountBalanceRepo() {
             org: 1,
             account: 1,
             "period.fiscalYear": 1,
-            "period.month": 1
+            "period.fiscalMonth": 1
           },
           unique: true,
-          name: "unique_balance_per_account_month"
+          name: "unique_balance_per_account_fiscal_month"
+        },
+        {
+          key: {
+            org: 1,
+            "period.fiscalYear": 1,
+            "period.fiscalMonth": 1
+          },
+          name: "balance_reporting_fiscal_month"
         }
       ]);
     } catch (error) {
@@ -19212,7 +19634,7 @@ function useAccountBalanceRepo() {
       }
       const items = await repo.collection.aggregate([
         { $match: query },
-        { $sort: { "period.fiscalYear": -1 } },
+        { $sort: { "period.fiscalYear": -1, "period.fiscalMonth": -1 } },
         { $skip: options.page * options.limit },
         { $limit: options.limit }
       ]).toArray();
@@ -19290,13 +19712,13 @@ function useAccountBalanceRepo() {
       account,
       org,
       "period.fiscalYear": options.fiscalYear,
-      "period.month": options.month
+      "period.fiscalMonth": options.fiscalMonth
     };
     const cacheKey = makeCacheKey28(namespace_collection, {
       account: String(account),
       org: String(org),
       fiscalYear: options.fiscalYear,
-      month: options.month
+      fiscalMonth: options.fiscalMonth
     });
     try {
       const cached = await repo.getCache(cacheKey);
@@ -19345,7 +19767,7 @@ function useAccountBalanceRepo() {
     try {
       return await repo.collection.find(
         { account, org, "period.fiscalYear": options.fiscalYear },
-        { sort: { "period.month": 1 } }
+        { sort: { "period.fiscalMonth": 1 } }
       ).toArray();
     } catch (error) {
       if (error instanceof AppError43) {
@@ -19354,7 +19776,7 @@ function useAccountBalanceRepo() {
       throw new InternalServerError39("Failed to get account balances by year.");
     }
   }
-  async function updateById(account, org, fiscalYear, month, options, session) {
+  async function updateById(account, org, fiscalYear, fiscalMonth, options, session) {
     const { error } = Joi82.object({
       openingDebit: Joi82.number().min(0).optional(),
       openingCredit: Joi82.number().min(0).optional(),
@@ -19385,7 +19807,7 @@ function useAccountBalanceRepo() {
           account,
           org,
           "period.fiscalYear": fiscalYear,
-          "period.month": month
+          "period.fiscalMonth": fiscalMonth
         },
         { $set: { ...options, updatedAt: /* @__PURE__ */ new Date() } },
         { session, upsert: true }
@@ -21418,20 +21840,6 @@ function useJournalService() {
         );
       }
       session.startTransaction();
-      const MONTHS = [
-        "January",
-        "February",
-        "March",
-        "April",
-        "May",
-        "June",
-        "July",
-        "August",
-        "September",
-        "October",
-        "November",
-        "December"
-      ];
       if (status2 === "posted") {
         await updateStatusByJournal(_id, status2, session);
         await _updateStatusById(_id, status2, session);
@@ -21446,13 +21854,30 @@ function useJournalService() {
         const linesToPost = await getJournalLinesByEntry(_id);
         const journalDate = new Date(journalEntry.date);
         const fiscalYear = Number(businessProfile.currentFiscalYear);
-        const month = journalDate.toLocaleString("en-US", { month: "long" });
+        const calendarYear = journalDate.getFullYear();
+        const calendarMonth = journalDate.getMonth() + 1;
+        const FISCAL_MONTHS = [
+          "January",
+          "February",
+          "March",
+          "April",
+          "May",
+          "June",
+          "July",
+          "August",
+          "September",
+          "October",
+          "November",
+          "December"
+        ];
+        const fiscalStartIdx = FISCAL_MONTHS.indexOf(businessProfile.fiscalYearStart);
+        const fiscalMonth = (calendarMonth - 1 - fiscalStartIdx + 12) % 12 + 1;
         for (const line of linesToPost) {
           const existingBalance = await getAccountBalance({
             account: String(line.account),
             org: String(journalEntry.org),
             fiscalYear,
-            month
+            fiscalMonth
           });
           if (existingBalance) {
             const movementDebit = existingBalance.movementDebit + (line.debit || 0);
@@ -21467,7 +21892,7 @@ function useJournalService() {
               String(line.account),
               String(journalEntry.org),
               fiscalYear,
-              month,
+              fiscalMonth,
               {
                 movementDebit,
                 movementCredit,
@@ -21484,10 +21909,7 @@ function useJournalService() {
               org: String(journalEntry.org),
               fiscalYear
             });
-            const currentMonthIdx = MONTHS.indexOf(month);
-            const previousRecord = allYearBalances.filter((r) => MONTHS.indexOf(r.period.month) < currentMonthIdx).sort(
-              (a, b) => MONTHS.indexOf(b.period.month) - MONTHS.indexOf(a.period.month)
-            )[0];
+            const previousRecord = allYearBalances.filter((r) => r.period.fiscalMonth < fiscalMonth).sort((a, b) => b.period.fiscalMonth - a.period.fiscalMonth)[0];
             const openingDebit = previousRecord?.closingDebit ?? 0;
             const openingCredit = previousRecord?.closingCredit ?? 0;
             const movementDebit = line.debit || 0;
@@ -21503,7 +21925,7 @@ function useJournalService() {
                 org: String(journalEntry.org),
                 account: String(line.account),
                 accountType: line.accountType || "",
-                period: { fiscalYear, month },
+                period: { fiscalYear, fiscalMonth, year: calendarYear, month: calendarMonth },
                 openingDebit,
                 openingCredit,
                 movementDebit,