@goweekdays/core 2.15.0 → 2.15.2

package/dist/index.mjs

@@ -18339,7 +18339,8 @@ function useChartOfAccountRepo() {
         { key: { code: 1 } },
         { key: { path: 1 } },
         { key: { name: 1, org: 1 }, unique: true, name: "unique_name_per_org" },
-        { key: { code: 1, org: 1 }, unique: true, name: "unique_code_per_org" }
+        { key: { code: 1, org: 1 }, unique: true, name: "unique_code_per_org" },
+        { key: { name: "text", code: "text" }, name: "text_search" }
       ]);
     } catch (error) {
       throw new Error("Failed to create index on chart of account.");
@@ -19145,7 +19146,12 @@ function useAccountBalanceRepo() {
         { key: { account: 1 } },
         { key: { "period.fiscalYear": 1 } },
         {
-          key: { org: 1, account: 1, "period.fiscalYear": 1, "period.month": 1 },
+          key: {
+            org: 1,
+            account: 1,
+            "period.fiscalYear": 1,
+            "period.month": 1
+          },
           unique: true,
           name: "unique_balance_per_account_month"
         }
@@ -19320,9 +19326,7 @@ function useAccountBalanceRepo() {
       if (error instanceof AppError43) {
         throw error;
       }
-      throw new InternalServerError39(
-        "Failed to get account balance."
-      );
+      throw new InternalServerError39("Failed to get account balance.");
     }
   }
   async function getYearBalancesByAccount(options) {
@@ -19347,9 +19351,7 @@ function useAccountBalanceRepo() {
       if (error instanceof AppError43) {
         throw error;
       }
-      throw new InternalServerError39(
-        "Failed to get account balances by year."
-      );
+      throw new InternalServerError39("Failed to get account balances by year.");
     }
   }
   async function updateById(account, org, fiscalYear, month, options, session) {
@@ -19435,7 +19437,7 @@ var journalTypes = [
 var schemaJournalBase = {
   date: Joi83.date().required(),
   type: Joi83.string().allow(...journalTypes).required(),
-  transaction: Joi83.string().required(),
+  transaction: Joi83.string().hex().required(),
   customer: Joi83.string().hex().optional().allow("", null),
   description: Joi83.string().required(),
   invoiceNumber: Joi83.string().optional().allow("", null)
@@ -19452,6 +19454,7 @@ var schemaJournalRepo = Joi83.object({
   id: Joi83.string().required(),
   createdBy: Joi83.string().hex().required(),
   createdByName: Joi83.string().required(),
+  transactionName: Joi83.string().required(),
   customerName: Joi83.string().optional().allow("", null),
   status: Joi83.string().valid(...JournalStatuses).required(),
   reversedEntry: Joi83.string().hex().optional().allow("", null),
@@ -19463,6 +19466,7 @@ var schemaJournalRepoUpdate = Joi83.object({
   date: Joi83.date().optional().allow("", null),
   type: Joi83.string().allow(...journalTypes).optional().allow("", null),
   transaction: Joi83.string().optional().allow("", null),
+  transactionName: Joi83.string().optional().allow("", null),
   description: Joi83.string().optional().allow("", null),
   status: Joi83.string().valid(...JournalStatuses).optional().allow("", null),
   customerName: Joi83.string().optional().allow("", null),
@@ -19491,6 +19495,11 @@ function modelJournal(data) {
   } catch (error2) {
     throw new BadRequestError93(`Invalid org ID: ${data.org}`);
   }
+  try {
+    data.transaction = new ObjectId50(data.transaction);
+  } catch (error2) {
+    throw new BadRequestError93(`Invalid transaction ID: ${data.transaction}`);
+  }
   try {
     data.createdBy = new ObjectId50(data.createdBy);
   } catch (error2) {
@@ -19535,6 +19544,7 @@ function modelJournal(data) {
     org: data.org,
     type: data.type,
     transaction: data.transaction,
+    transactionName: data.transactionName ?? "",
     date,
     invoiceNumber: data.invoiceNumber ?? "",
     customer: data.customer ?? "",
@@ -19839,6 +19849,24 @@ function useJournalRepo() {
       throw new InternalServerError40("Failed to update journal status.");
     }
   }
+  async function existsByTransactionId(org, transactionId) {
+    try {
+      org = new ObjectId51(org);
+    } catch {
+      throw new BadRequestError94("Invalid org ID.");
+    }
+    try {
+      transactionId = new ObjectId51(transactionId);
+    } catch {
+      throw new BadRequestError94("Invalid transaction ID.");
+    }
+    const count = await repo.collection.countDocuments({
+      org,
+      transaction: transactionId,
+      status: { $ne: "voided" }
+    });
+    return count > 0;
+  }
   return {
     createIndexes,
     delCachedData: repo.delCachedData,
@@ -19847,12 +19875,13 @@ function useJournalRepo() {
     getById,
     updateById,
     deleteById,
-    updateStatusById
+    updateStatusById,
+    existsByTransactionId
   };
 }
 
 // src/resources/finance-journal/finance.journal.service.ts
-import Joi90 from "joi";
+import Joi93 from "joi";
 
 // src/resources/finance-journal-line/finance.journal.line.model.ts
 import { BadRequestError as BadRequestError95 } from "@goweekdays/utils";
@@ -20192,6 +20221,23 @@ function useJournalLineRepo() {
       throw new InternalServerError41("Failed to delete journal line.");
     }
   }
+  async function updateBalanceById(_id, balance, session) {
+    try {
+      _id = new ObjectId53(_id);
+    } catch (error) {
+      throw new BadRequestError96("Invalid Journal Line ID.");
+    }
+    try {
+      await collection.updateOne(
+        { _id },
+        { $set: { balance, updatedAt: /* @__PURE__ */ new Date() } },
+        { session }
+      );
+      delCachedData();
+    } catch (error) {
+      throw new InternalServerError41("Failed to update journal line balance.");
+    }
+  }
   async function updateStatusByJournal(journalEntry, status2, session) {
     const validation = Joi86.object({
       journalEntry: Joi86.string().hex().required(),
@@ -20232,6 +20278,7 @@ function useJournalLineRepo() {
     getById,
     getByEntry,
     updateById,
+    updateBalanceById,
     deleteById,
     updateStatusByJournal
   };
@@ -20239,10 +20286,10 @@ function useJournalLineRepo() {
 
 // src/resources/finance-journal/finance.journal.service.ts
 import {
-  AppError as AppError47,
-  BadRequestError as BadRequestError101,
-  InternalServerError as InternalServerError43,
-  NotFoundError as NotFoundError6,
+  AppError as AppError49,
+  BadRequestError as BadRequestError105,
+  InternalServerError as InternalServerError45,
+  NotFoundError as NotFoundError7,
   useAtlas as useAtlas16
 } from "@goweekdays/utils";
 
@@ -20661,6 +20708,542 @@ function useJournalLogRepo() {
 import Joi89 from "joi";
 import { BadRequestError as BadRequestError100, logger as logger51 } from "@goweekdays/utils";
 
+// src/resources/finance-journal-transaction/finance.journal.transaction.model.ts
+import { BadRequestError as BadRequestError101 } from "@goweekdays/utils";
+import Joi90 from "joi";
+import { ObjectId as ObjectId56 } from "mongodb";
+var schemaJournalTransactionAccount = Joi90.object({
+  title: Joi90.string().required(),
+  value: Joi90.string().hex().required()
+});
+var schemaJournalTransactionBase = {
+  type: Joi90.string().valid(...journalTypes).required(),
+  code: Joi90.string().required(),
+  title: Joi90.string().required(),
+  debits: Joi90.array().items(schemaJournalTransactionAccount).min(1).required(),
+  credits: Joi90.array().items(schemaJournalTransactionAccount).min(1).required(),
+  template: Joi90.boolean().required(),
+  description: Joi90.string().optional().allow("", null)
+};
+var schemaJournalTransactionCtrl = Joi90.object({
+  ...schemaJournalTransactionBase,
+  org: Joi90.string().hex().required(),
+  createdBy: Joi90.string().hex().required()
+});
+var schemaJournalTransactionCtrlUpdate = Joi90.object({
+  code: Joi90.string().optional(),
+  title: Joi90.string().optional(),
+  debits: Joi90.array().items(schemaJournalTransactionAccount).min(1).optional(),
+  credits: Joi90.array().items(schemaJournalTransactionAccount).min(1).optional(),
+  template: Joi90.boolean().optional(),
+  description: Joi90.string().optional().allow("", null)
+});
+var schemaJournalTransactionRepo = Joi90.object({
+  ...schemaJournalTransactionBase,
+  org: Joi90.string().hex().required(),
+  createdBy: Joi90.string().hex().required(),
+  createdByName: Joi90.string().optional().allow("", null)
+});
+var schemaJournalTransactionGetAll = Joi90.object({
+  org: Joi90.string().hex().required(),
+  type: Joi90.string().optional().allow("", null),
+  search: Joi90.string().optional().allow("", null),
+  page: Joi90.number().optional().allow("", null),
+  limit: Joi90.number().max(100).optional().allow("", null)
+});
+function modelJournalTransaction(data) {
+  const { error } = schemaJournalTransactionRepo.validate(data);
+  if (error) {
+    throw new BadRequestError101(
+      `Invalid journal transaction data: ${error.message}`
+    );
+  }
+  try {
+    data.org = new ObjectId56(data.org);
+  } catch (error2) {
+    throw new BadRequestError101(`Invalid org ID: ${data.org}`);
+  }
+  try {
+    data.createdBy = new ObjectId56(data.createdBy);
+  } catch (error2) {
+    throw new BadRequestError101(`Invalid createdBy ID: ${data.createdBy}`);
+  }
+  for (let i = 0; i < data.debits.length; i++) {
+    try {
+      data.debits[i].value = new ObjectId56(data.debits[i].value);
+    } catch (error2) {
+      throw new BadRequestError101(`Invalid debit account ID at index ${i}`);
+    }
+  }
+  for (let i = 0; i < data.credits.length; i++) {
+    try {
+      data.credits[i].value = new ObjectId56(data.credits[i].value);
+    } catch (error2) {
+      throw new BadRequestError101(`Invalid credit account ID at index ${i}`);
+    }
+  }
+  const now = /* @__PURE__ */ new Date();
+  return {
+    _id: data._id,
+    org: data.org,
+    type: data.type,
+    code: data.code,
+    title: data.title,
+    debits: data.debits,
+    credits: data.credits,
+    template: data.template ?? false,
+    description: data.description ?? "",
+    createdBy: data.createdBy,
+    createdByName: data.createdByName ?? "",
+    createdAt: data.createdAt ?? now,
+    updatedAt: data.updatedAt ?? ""
+  };
+}
+
+// src/resources/finance-journal-transaction/finance.journal.transaction.repository.ts
+import {
+  AppError as AppError47,
+  BadRequestError as BadRequestError102,
+  makeCacheKey as makeCacheKey32,
+  paginate as paginate28,
+  logger as logger52,
+  InternalServerError as InternalServerError43,
+  useRepo as useRepo31
+} from "@goweekdays/utils";
+import { ObjectId as ObjectId57 } from "mongodb";
+function useJournalTransactionRepo() {
+  const namespace_collection = "finance.journal.transactions";
+  const repo = useRepo31(namespace_collection);
+  async function createIndexes() {
+    try {
+      await repo.collection.createIndexes([
+        { key: { org: 1, type: 1, _id: 1 } },
+        { key: { org: 1 } },
+        { key: { type: 1 } },
+        { key: { code: 1 } },
+        { key: { org: 1, type: 1 } },
+        {
+          key: {
+            title: "text",
+            code: "text",
+            description: "text"
+          }
+        },
+        {
+          key: { org: 1, type: 1, code: 1 },
+          unique: true,
+          name: "unique_org_type_code"
+        }
+      ]);
+    } catch (error) {
+      throw new Error("Failed to create index on journal transactions.");
+    }
+  }
+  async function add(value, session) {
+    try {
+      value = modelJournalTransaction(value);
+      const res = await repo.collection.insertOne(value, { session });
+      repo.delCachedData();
+      return res.insertedId;
+    } catch (error) {
+      logger52.log({ level: "error", message: error.message });
+      throw new BadRequestError102(
+        `Failed to create journal transaction: ${error.message}`
+      );
+    }
+  }
+  async function getAll(options) {
+    options.page = options.page && options.page > 0 ? options.page - 1 : 0;
+    options.limit = options.limit ?? 10;
+    options.search = options.search ?? "";
+    const { error } = schemaJournalTransactionGetAll.validate(options);
+    if (error) {
+      throw new BadRequestError102(`Invalid query parameters: ${error.message}`);
+    }
+    const query = {};
+    const cacheKeyOptions = {
+      page: options.page,
+      limit: options.limit
+    };
+    try {
+      query.org = new ObjectId57(options.org);
+      cacheKeyOptions.org = String(options.org);
+    } catch (error2) {
+      throw new BadRequestError102("Invalid organization ID.");
+    }
+    if (options.type) {
+      query.type = options.type;
+      cacheKeyOptions.type = options.type;
+    }
+    if (options.search) {
+      query.$text = { $search: options.search };
+      cacheKeyOptions.search = options.search;
+    }
+    const cacheKey = makeCacheKey32(namespace_collection, cacheKeyOptions);
+    logger52.log({
+      level: "info",
+      message: `Cache key for getAll journal transactions: ${cacheKey}`
+    });
+    try {
+      const cached = await repo.getCache(cacheKey);
+      if (cached) {
+        logger52.log({
+          level: "info",
+          message: `Cache hit for getAll journal transactions: ${cacheKey}`
+        });
+        return cached;
+      }
+      const items = await repo.collection.aggregate([
+        { $match: query },
+        { $sort: { title: 1 } },
+        { $skip: options.page * options.limit },
+        { $limit: options.limit }
+      ]).toArray();
+      const length = await repo.collection.countDocuments(query);
+      const data = paginate28(items, options.page, options.limit, length);
+      repo.setCache(cacheKey, data, 600).then(() => {
+        logger52.log({
+          level: "info",
+          message: `Cache set for getAll journal transactions: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger52.log({
+          level: "error",
+          message: `Failed to set cache for getAll journal transactions: ${err.message}`
+        });
+      });
+      return data;
+    } catch (error2) {
+      logger52.log({ level: "error", message: `${error2}` });
+      throw error2;
+    }
+  }
+  async function getByOrgTypeId(options) {
+    try {
+      options._id = new ObjectId57(options._id);
+    } catch (error) {
+      throw new BadRequestError102("Invalid ID.");
+    }
+    try {
+      options.org = new ObjectId57(options.org);
+    } catch (error) {
+      throw new BadRequestError102("Invalid organization ID.");
+    }
+    const cacheKey = makeCacheKey32(namespace_collection, {
+      org: String(options.org),
+      type: options.type,
+      _id: String(options._id),
+      tag: "org_type_id"
+    });
+    try {
+      const cached = await repo.getCache(cacheKey);
+      if (cached) {
+        logger52.log({
+          level: "info",
+          message: `Cache hit for get by org + type + id journal transaction: ${cacheKey}`
+        });
+        return cached;
+      }
+      const result = await repo.collection.findOne({
+        _id: options._id,
+        org: options.org,
+        type: options.type
+      });
+      repo.setCache(cacheKey, result, 300).then(() => {
+        logger52.log({
+          level: "info",
+          message: `Cache set for journal transaction by org + type + id: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger52.log({
+          level: "error",
+          message: `Failed to set cache for journal transaction by org + type + id: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error) {
+      if (error instanceof AppError47) {
+        throw error;
+      } else {
+        throw new InternalServerError43("Failed to get journal transaction.");
+      }
+    }
+  }
+  async function updateById(_id, options, session) {
+    const { error } = schemaJournalTransactionCtrlUpdate.validate(options);
+    if (error) {
+      throw new BadRequestError102(
+        `Invalid journal transaction update data: ${error.message}`
+      );
+    }
+    try {
+      _id = new ObjectId57(_id);
+    } catch (error2) {
+      throw new BadRequestError102("Invalid journal transaction ID.");
+    }
+    if (options.debits) {
+      for (let i = 0; i < options.debits.length; i++) {
+        try {
+          options.debits[i].value = new ObjectId57(options.debits[i].value);
+        } catch (error2) {
+          throw new BadRequestError102(`Invalid debit account ID at index ${i}`);
+        }
+      }
+    }
+    if (options.credits) {
+      for (let i = 0; i < options.credits.length; i++) {
+        try {
+          options.credits[i].value = new ObjectId57(options.credits[i].value);
+        } catch (error2) {
+          throw new BadRequestError102(`Invalid credit account ID at index ${i}`);
+        }
+      }
+    }
+    try {
+      await repo.collection.updateOne(
+        { _id },
+        { $set: { ...options, updatedAt: /* @__PURE__ */ new Date() } },
+        { session }
+      );
+      repo.delCachedData();
+      return "Successfully updated journal transaction.";
+    } catch (error2) {
+      throw new InternalServerError43("Failed to update journal transaction.");
+    }
+  }
+  async function deleteById(_id, session) {
+    try {
+      _id = new ObjectId57(_id);
+    } catch (error) {
+      throw new BadRequestError102("Invalid ID.");
+    }
+    try {
+      await repo.collection.deleteOne({ _id }, { session });
+      repo.delCachedData();
+      return "Successfully deleted journal transaction.";
+    } catch (error) {
+      throw new InternalServerError43("Failed to delete journal transaction.");
+    }
+  }
+  return {
+    createIndexes,
+    add,
+    getAll,
+    getByOrgTypeId,
+    updateById,
+    deleteById
+  };
+}
+
+// src/resources/finance-journal-transaction/finance.journal.transaction.service.ts
+import {
+  AppError as AppError48,
+  BadRequestError as BadRequestError103,
+  InternalServerError as InternalServerError44,
+  NotFoundError as NotFoundError6
+} from "@goweekdays/utils";
+import Joi91 from "joi";
+function validateNoDuplicateAccounts(debits, credits) {
+  const debitIds = debits.map((d) => String(d.value));
+  const creditIds = credits.map((c) => String(c.value));
+  const debitSet = new Set(debitIds);
+  if (debitSet.size !== debitIds.length) {
+    throw new BadRequestError103("Duplicate accounts found in debits.");
+  }
+  const creditSet = new Set(creditIds);
+  if (creditSet.size !== creditIds.length) {
+    throw new BadRequestError103("Duplicate accounts found in credits.");
+  }
+}
+function useJournalTransactionService() {
+  const {
+    add: _add,
+    updateById: _updateById,
+    getByOrgTypeId
+  } = useJournalTransactionRepo();
+  const { getUserById } = useUserRepo();
+  async function add(value) {
+    const { error } = schemaJournalTransactionCtrl.validate(value);
+    if (error) {
+      throw new BadRequestError103(
+        `Invalid journal transaction data: ${error.message}`
+      );
+    }
+    validateNoDuplicateAccounts(value.debits, value.credits);
+    const user = await getUserById(value.createdBy);
+    if (!user) {
+      throw new NotFoundError6("User not found.");
+    }
+    value.createdByName = `${user.firstName} ${user.lastName}`;
+    try {
+      const id = await _add(value);
+      return id;
+    } catch (error2) {
+      if (error2 instanceof AppError48) {
+        throw error2;
+      }
+      throw new InternalServerError44(
+        `Failed to create journal transaction: ${error2.message}`
+      );
+    }
+  }
+  async function updateById(org, type, _id, options) {
+    const { error: idError } = Joi91.string().hex().required().validate(_id);
+    if (idError) {
+      throw new BadRequestError103("Invalid journal transaction ID.");
+    }
+    const { error } = schemaJournalTransactionCtrlUpdate.validate(options);
+    if (error) {
+      throw new BadRequestError103(`Invalid update data: ${error.message}`);
+    }
+    const existing = await getByOrgTypeId({ org, type, _id });
+    if (!existing) {
+      throw new NotFoundError6("Journal transaction not found.");
+    }
+    const debits = options.debits ?? existing.debits;
+    const credits = options.credits ?? existing.credits;
+    validateNoDuplicateAccounts(debits, credits);
+    try {
+      return await _updateById(_id, options);
+    } catch (error2) {
+      if (error2 instanceof AppError48) {
+        throw error2;
+      }
+      throw new InternalServerError44(
+        `Failed to update journal transaction: ${error2.message}`
+      );
+    }
+  }
+  return {
+    add,
+    updateById
+  };
+}
+
+// src/resources/finance-journal-transaction/finance.journal.transaction.controller.ts
+import Joi92 from "joi";
+import { BadRequestError as BadRequestError104 } from "@goweekdays/utils";
+function useJournalTransactionController() {
+  const {
+    getAll: _getAll,
+    getByOrgTypeId: _getByOrgTypeId,
+    deleteById: _deleteById
+  } = useJournalTransactionRepo();
+  const { add: _add, updateById: _updateById } = useJournalTransactionService();
+  async function add(req, res, next) {
+    const value = req.body;
+    const { error } = schemaJournalTransactionCtrl.validate(value);
+    if (error) {
+      next(new BadRequestError104(error.message));
+      return;
+    }
+    try {
+      const id = await _add(value);
+      res.json({ message: "Journal transaction created successfully.", id });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getAll(req, res, next) {
+    const org = req.params.org ?? "";
+    const type = req.params.type ?? "";
+    const search = req.query.search ?? "";
+    const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
+    const limit = typeof req.query.limit === "string" ? Number(req.query.limit) : 10;
+    const { error } = schemaJournalTransactionGetAll.validate({
+      ...req.params,
+      ...req.query
+    });
+    if (!isFinite(page)) {
+      next(new BadRequestError104("Invalid page number."));
+      return;
+    }
+    if (!isFinite(limit)) {
+      next(new BadRequestError104("Invalid limit number."));
+      return;
+    }
+    if (error) {
+      next(new BadRequestError104(error.message));
+      return;
+    }
+    try {
+      const data = await _getAll({ org, type, search, page, limit });
+      res.json(data);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getByOrgTypeId(req, res, next) {
+    const { error } = Joi92.object({
+      org: Joi92.string().hex().required(),
+      type: Joi92.string().required(),
+      id: Joi92.string().hex().required()
+    }).validate(req.params);
+    if (error) {
+      next(new BadRequestError104(error.message));
+      return;
+    }
+    const _id = req.params.id;
+    const org = req.params.org;
+    const type = req.params.type;
+    try {
+      const data = await _getByOrgTypeId({ org, type, _id });
+      res.json(data);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function updateById(req, res, next) {
+    const value = req.body;
+    const { error } = Joi92.object({
+      id: Joi92.string().hex().required(),
+      org: Joi92.string().hex().required(),
+      type: Joi92.string().allow(...journalTypes).required()
+    }).concat(schemaJournalTransactionCtrlUpdate).validate({ ...req.params, ...value });
+    if (error) {
+      next(new BadRequestError104(error.message));
+      return;
+    }
+    const id = req.params.id ?? "";
+    const org = req.params.org ?? "";
+    const type = req.params.type ?? "";
+    try {
+      const message = await _updateById(org, type, id, value);
+      res.json({ message });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function deleteById(req, res, next) {
+    const id = req.params.id;
+    const { error } = Joi92.object({
+      id: Joi92.string().hex().required()
+    }).validate({ id });
+    if (error) {
+      next(new BadRequestError104(error.message));
+      return;
+    }
+    try {
+      const message = await _deleteById(id);
+      res.json({ message });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  return {
+    add,
+    getAll,
+    getByOrgTypeId,
+    updateById,
+    deleteById
+  };
+}
+
 // src/resources/finance-journal/finance.journal.service.ts
 function useJournalService() {
   const {
@@ -20670,10 +21253,12 @@ function useJournalService() {
     updateById: _updateById,
     delCachedData: delJournalCache
   } = useJournalRepo();
+  const { getByOrgTypeId: getJournalTransaction } = useJournalTransactionRepo();
   const {
     add: addLine,
     getByEntry: getJournalLinesByEntry,
     updateById: updateJournalLineById,
+    updateBalanceById: updateJournalLineBalance,
     deleteById: deleteJournalLineById
   } = useJournalLineRepo();
   const { getUserById } = useUserRepo();
@@ -20687,21 +21272,21 @@ function useJournalService() {
   const { add: addJournalLog } = useJournalLogRepo();
   const { getById: getCustomerById } = useCustomerRepo();
   async function add(entry, lines) {
-    const { error } = Joi90.object({
+    const { error } = Joi93.object({
       journalEntry: schemaJournalCtrl.required(),
-      journalLines: Joi90.array().items(schemaJournalLineCtrl).min(1).required()
+      journalLines: Joi93.array().items(schemaJournalLineCtrl).min(1).required()
     }).validate({
       journalEntry: entry,
       journalLines: lines
     });
     if (error) {
-      throw new BadRequestError101(
+      throw new BadRequestError105(
         `Invalid general journal data: ${error.message}`
       );
     }
     const session = useAtlas16.getClient()?.startSession();
     if (!session) {
-      throw new BadRequestError101("Unable to start database session.");
+      throw new BadRequestError105("Unable to start database session.");
     }
     try {
       session.startTransaction();
@@ -20716,16 +21301,25 @@ function useJournalService() {
       await validateJournalLines(lines);
       const user = await getUserById(entry.createdBy);
       if (!user) {
-        throw new NotFoundError6("User not found.");
+        throw new NotFoundError7("User not found.");
       }
       entry.createdByName = `${user.firstName} ${user.lastName}`;
       if (entry.customer) {
         const customer = await getCustomerById(String(entry.customer));
         if (!customer) {
-          throw new NotFoundError6("Customer not found.");
+          throw new NotFoundError7("Customer not found.");
         }
         entry.customerName = `${customer.firstName} ${customer.lastName}`;
       }
+      const journalTx = await getJournalTransaction({
+        org: String(entry.org),
+        type: entry.type,
+        _id: String(entry.transaction)
+      });
+      if (!journalTx) {
+        throw new NotFoundError7("Transaction not found.");
+      }
+      entry.transactionName = journalTx.title;
       entry.status = "draft";
       const entryId = await _add(entry, session);
       for (const line of lines) {
@@ -20733,7 +21327,7 @@ function useJournalService() {
         line.journalEntry = entryId.toString();
         const account = await getAccountById(String(line.account));
         if (!account) {
-          throw new NotFoundError6(`Account not found: ${line.account}`);
+          throw new NotFoundError7(`Account not found: ${line.account}`);
         }
         line.accountName = account.name;
         line.accountCode = account.code;
@@ -20765,10 +21359,10 @@ function useJournalService() {
       return "Journal entry created successfully.";
     } catch (error2) {
       await session.abortTransaction();
-      if (error2 instanceof AppError47) {
+      if (error2 instanceof AppError49) {
         throw error2;
       }
-      throw new InternalServerError43(
+      throw new InternalServerError45(
         `Failed to create general journal: ${error2.message}`
       );
     } finally {
@@ -20782,18 +21376,19 @@ function useJournalService() {
     getYearBalancesByAccount,
     updateById: updateAccountBalance
   } = useAccountBalanceRepo();
+  const { getByOrg: getBusinessProfileByOrg } = useBusinessProfileRepo();
   async function updateStatusById(_id, status2, user) {
-    const validation = Joi90.object({
-      _id: Joi90.string().hex().required(),
-      status: Joi90.string().valid("posted", "voided").required()
+    const validation = Joi93.object({
+      _id: Joi93.string().hex().required(),
+      status: Joi93.string().valid("posted", "voided").required()
     });
     const { error } = validation.validate({ _id, status: status2 });
     if (error) {
-      throw new BadRequestError101(`Invalid input: ${error.message}`);
+      throw new BadRequestError105(`Invalid input: ${error.message}`);
     }
     const session = useAtlas16.getClient()?.startSession();
     if (!session) {
-      throw new BadRequestError101("Unable to start database session.");
+      throw new BadRequestError105("Unable to start database session.");
     }
     try {
       let computeClosingBalance2 = function(openingDebit, openingCredit, movementDebit, movementCredit) {
@@ -20807,18 +21402,18 @@ function useJournalService() {
       var computeClosingBalance = computeClosingBalance2;
       const journalEntry = await getJournalById(_id);
       if (!journalEntry) {
-        throw new NotFoundError6("Journal entry not found.");
+        throw new NotFoundError7("Journal entry not found.");
       }
       if (journalEntry.status === "voided") {
-        throw new BadRequestError101("Cannot update a voided general journal.");
+        throw new BadRequestError105("Cannot update a voided general journal.");
       }
       if (journalEntry.status === "posted" && status2 === "draft") {
-        throw new BadRequestError101(
+        throw new BadRequestError105(
           "Cannot revert a posted general journal to draft."
         );
       }
       if (status2 === "voided" && journalEntry.reversalDraft) {
-        throw new BadRequestError101(
+        throw new BadRequestError105(
           "Cannot void a general journal with an existing reversal draft."
         );
       }
@@ -20840,9 +21435,17 @@ function useJournalService() {
       if (status2 === "posted") {
         await updateStatusByJournal(_id, status2, session);
         await _updateStatusById(_id, status2, session);
+        const businessProfile = await getBusinessProfileByOrg(
+          String(journalEntry.org)
+        );
+        if (!businessProfile) {
+          throw new NotFoundError7(
+            "Business profile not found for organization."
+          );
+        }
         const linesToPost = await getJournalLinesByEntry(_id);
         const journalDate = new Date(journalEntry.date);
-        const fiscalYear = journalDate.getFullYear();
+        const fiscalYear = Number(businessProfile.currentFiscalYear);
         const month = journalDate.toLocaleString("en-US", { month: "long" });
         for (const line of linesToPost) {
           const existingBalance = await getAccountBalance({
@@ -20865,9 +21468,16 @@ function useJournalService() {
               String(journalEntry.org),
               fiscalYear,
               month,
-              { movementDebit, movementCredit, closingDebit, closingCredit, netBalance },
+              {
+                movementDebit,
+                movementCredit,
+                closingDebit,
+                closingCredit,
+                netBalance
+              },
               session
             );
+            await updateJournalLineBalance(String(line._id), netBalance, session);
           } else {
             const allYearBalances = await getYearBalancesByAccount({
               account: String(line.account),
@@ -20875,7 +21485,9 @@ function useJournalService() {
               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) => MONTHS.indexOf(r.period.month) < currentMonthIdx).sort(
+              (a, b) => MONTHS.indexOf(b.period.month) - MONTHS.indexOf(a.period.month)
+            )[0];
             const openingDebit = previousRecord?.closingDebit ?? 0;
             const openingCredit = previousRecord?.closingCredit ?? 0;
             const movementDebit = line.debit || 0;
@@ -20904,6 +21516,7 @@ function useJournalService() {
               },
               session
             );
+            await updateJournalLineBalance(String(line._id), netBalance, session);
           }
         }
         await addJournalLog(
@@ -20918,7 +21531,7 @@ function useJournalService() {
         if (journalEntry.reversedEntry) {
           const userData = await getUserById(user);
           if (!userData) {
-            throw new NotFoundError6("User not found.");
+            throw new NotFoundError7("User not found.");
           }
           await _updateById(
             journalEntry.reversedEntry,
@@ -20930,6 +21543,7 @@ function useJournalService() {
             },
             session
           );
+          await updateStatusByJournal(String(journalEntry.reversedEntry), "voided", session);
           await addJournalLog(
             {
               journalId: String(journalEntry._id),
@@ -20946,7 +21560,7 @@ function useJournalService() {
         const counterName = `${journalEntry.org.toString()}-general-journal`;
         const counter = await getCounterByType(counterName);
         if (!counter) {
-          throw new NotFoundError6("Counter not found for general journal.");
+          throw new NotFoundError7("Counter not found for general journal.");
         }
         const date = /* @__PURE__ */ new Date();
         const entryNumber = counter ? counter.count + 1 : 1;
@@ -20955,7 +21569,8 @@ function useJournalService() {
           org: String(journalEntry.org),
           id: entryNumber.toString().padStart(6, "0"),
           type: journalEntry.type,
-          transaction: journalEntry.transaction,
+          transaction: String(journalEntry.transaction),
+          transactionName: journalEntry.transactionName,
           date,
           description: `Reversal of ${getPrefixByType(journalEntry.type)}-${journalEntry.id}`,
           createdBy: String(journalEntry.createdBy),
@@ -20974,7 +21589,7 @@ function useJournalService() {
         );
         const lines = await getJournalLinesByEntry(String(journalEntry._id));
         if (lines && lines.length === 0) {
-          throw new NotFoundError6("Journal lines not found for reversal.");
+          throw new NotFoundError7("Journal lines not found for reversal.");
         }
         const reversedLines = [];
         for (const line of lines) {
@@ -21019,10 +21634,10 @@ function useJournalService() {
       return "Journal entry status updated successfully.";
     } catch (error2) {
       await session.abortTransaction();
-      if (error2 instanceof AppError47) {
+      if (error2 instanceof AppError49) {
         throw error2;
       }
-      throw new InternalServerError43(
+      throw new InternalServerError45(
         `Failed to update general journal status: ${error2.message}`
       );
     } finally {
@@ -21030,11 +21645,11 @@ function useJournalService() {
     }
   }
   async function updateById(id, entry, lines, user) {
-    const { error } = Joi90.object({
-      id: Joi90.string().hex().required(),
+    const { error } = Joi93.object({
+      id: Joi93.string().hex().required(),
       journalEntry: schemaJournalCtrlUpdate.required(),
-      journalLines: Joi90.array().items(schemaJournalLineCtrlUpdate).min(1).required(),
-      user: Joi90.string().hex().required()
+      journalLines: Joi93.array().items(schemaJournalLineCtrlUpdate).min(1).required(),
+      user: Joi93.string().hex().required()
     }).validate({
       id,
       journalEntry: entry,
@@ -21042,13 +21657,13 @@ function useJournalService() {
       user
     });
     if (error) {
-      throw new BadRequestError101(
+      throw new BadRequestError105(
         `Invalid general journal data: ${error.message}`
       );
     }
     const session = useAtlas16.getClient()?.startSession();
     if (!session) {
-      throw new BadRequestError101("Unable to start database session.");
+      throw new BadRequestError105("Unable to start database session.");
     }
     try {
       let hasLineChanged2 = function(existing, incoming) {
@@ -21058,24 +21673,37 @@ function useJournalService() {
       session.startTransaction();
       const existingEntry = await getJournalById(id);
       if (!existingEntry) {
-        throw new NotFoundError6("Journal entry not found.");
+        throw new NotFoundError7("Journal entry not found.");
       }
       if (existingEntry.status !== "draft") {
-        throw new BadRequestError101("Only draft journal entries can be updated.");
+        throw new BadRequestError105("Only draft journal entries can be updated.");
       }
       const updatedBy = await getUserById(user);
       if (!updatedBy) {
-        throw new NotFoundError6("User not found.");
+        throw new NotFoundError7("User not found.");
       }
       await validateJournalLines(lines);
-      const headerChanged = new Date(existingEntry.date).getTime() !== new Date(entry.date).getTime() || existingEntry.description !== entry.description || String(existingEntry.customer || "") !== String(entry.customer || "") || existingEntry.transaction !== entry.transaction;
+      const headerChanged = new Date(existingEntry.date).getTime() !== new Date(entry.date).getTime() || existingEntry.description !== entry.description || String(existingEntry.customer || "") !== String(entry.customer || "") || String(existingEntry.transaction) !== String(entry.transaction);
       if (entry.customer && String(entry.customer) !== String(existingEntry.customer)) {
         const customer = await getCustomerById(String(entry.customer));
         if (!customer) {
-          throw new NotFoundError6("Customer not found.");
+          throw new NotFoundError7("Customer not found.");
         }
         entry.customerName = `${customer.firstName} ${customer.lastName}`;
       }
+      if (String(existingEntry.transaction) !== String(entry.transaction)) {
+        const journalTx = await getJournalTransaction({
+          org: String(existingEntry.org),
+          type: entry.type,
+          _id: String(entry.transaction)
+        });
+        if (!journalTx) {
+          throw new NotFoundError7("Transaction not found.");
+        }
+        entry.transactionName = journalTx.title;
+      } else {
+        entry.transactionName = existingEntry.transactionName;
+      }
       const existingLines = await getJournalLinesByEntry(id);
       const existingLineMap = new Map(
         existingLines.map((line) => [String(line._id), line])
@@ -21090,7 +21718,7 @@ function useJournalService() {
         (existingId) => !incomingIds.has(existingId)
       );
       if (existingLines.length > 0 && removedLineIds.length === existingLines.length && lines.length > 0) {
-        throw new BadRequestError101(
+        throw new BadRequestError105(
           "All journal lines marked for deletion. Identity mismatch suspected."
         );
       }
@@ -21108,7 +21736,7 @@ function useJournalService() {
       const newLines = lines.filter((line) => !line._id);
       const nothingChanged = !headerChanged && removedLineIds.length === 0 && updatedLines.length === 0 && newLines.length === 0;
       if (nothingChanged) {
-        throw new BadRequestError101("No changes detected.");
+        throw new BadRequestError105("No changes detected.");
       }
       for (const lineId of removedLineIds) {
         await deleteJournalLineById(lineId, session);
@@ -21123,7 +21751,7 @@ function useJournalService() {
         if (existing && String(existing.account) !== String(line.account)) {
           const account = await getAccountById(String(line.account));
           if (!account) {
-            throw new NotFoundError6(`Account not found: ${line.account}`);
+            throw new NotFoundError7(`Account not found: ${line.account}`);
           }
           updatePayload.accountName = account.name;
           updatePayload.accountCode = account.code;
@@ -21133,7 +21761,7 @@ function useJournalService() {
       for (const line of newLines) {
         const account = await getAccountById(String(line.account));
         if (!account) {
-          throw new NotFoundError6(`Account not found: ${line.account}`);
+          throw new NotFoundError7(`Account not found: ${line.account}`);
         }
         await addLine(
           {
@@ -21218,10 +21846,10 @@ function useJournalService() {
       return "Journal entry updated successfully.";
     } catch (error2) {
       await session.abortTransaction();
-      if (error2 instanceof AppError47) {
+      if (error2 instanceof AppError49) {
         throw error2;
       }
-      throw new InternalServerError43(
+      throw new InternalServerError45(
         `Failed to update general journal: ${error2.message}`
       );
     } finally {
@@ -21236,8 +21864,8 @@ function useJournalService() {
 }
 
 // src/resources/finance-journal/finance.journal.controller.ts
-import Joi91 from "joi";
-import { BadRequestError as BadRequestError102, logger as logger52 } from "@goweekdays/utils";
+import Joi94 from "joi";
+import { BadRequestError as BadRequestError106, logger as logger53 } from "@goweekdays/utils";
 function useJournalController() {
   const {
     getAll: _getAll,
@@ -21251,13 +21879,13 @@ function useJournalController() {
   } = useJournalService();
   async function add(req, res, next) {
     const value = req.body;
-    const { error } = Joi91.object({
+    const { error } = Joi94.object({
       journalEntry: schemaJournalCtrl.required(),
-      journalLines: Joi91.array().items(schemaJournalLineCtrl).min(1).required()
+      journalLines: Joi94.array().items(schemaJournalLineCtrl).min(1).required()
     }).validate(value);
     if (error) {
-      next(new BadRequestError102(error.message));
-      logger52.info(`Controller: ${error.message}`);
+      next(new BadRequestError106(error.message));
+      logger53.info(`Controller: ${error.message}`);
       return;
     }
     try {
@@ -21278,15 +21906,15 @@ function useJournalController() {
     const search = req.query.search ?? "";
     const status2 = req.query.status ?? "all";
     if (!isFinite(page)) {
-      next(new BadRequestError102("Invalid page number."));
+      next(new BadRequestError106("Invalid page number."));
       return;
     }
     if (!isFinite(limit)) {
-      next(new BadRequestError102("Invalid limit number."));
+      next(new BadRequestError106("Invalid limit number."));
       return;
     }
     if (error) {
-      next(new BadRequestError102(error.message));
+      next(new BadRequestError106(error.message));
       return;
     }
     try {
@@ -21306,12 +21934,12 @@ function useJournalController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi91.object({
-      id: Joi91.string().hex().required()
+    const validation = Joi94.object({
+      id: Joi94.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError102(error.message));
+      next(new BadRequestError106(error.message));
       return;
     }
     try {
@@ -21326,15 +21954,15 @@ function useJournalController() {
     const value = req.body;
     const id = req.params.id ?? "";
     const user = req.cookies.user;
-    const { error } = Joi91.object({
-      id: Joi91.string().hex().required(),
+    const { error } = Joi94.object({
+      id: Joi94.string().hex().required(),
       journalEntry: schemaJournalCtrlUpdate.required(),
-      journalLines: Joi91.array().items(schemaJournalLineCtrlUpdate).min(1).required(),
-      user: Joi91.string().hex().required()
+      journalLines: Joi94.array().items(schemaJournalLineCtrlUpdate).min(1).required(),
+      user: Joi94.string().hex().required()
     }).validate({ id, user, ...value });
     if (error) {
-      next(new BadRequestError102(error.message));
-      logger52.info(`Controller: ${error.message}`);
+      next(new BadRequestError106(error.message));
+      logger53.info(`Controller: ${error.message}`);
       return;
     }
     try {
@@ -21353,7 +21981,7 @@ function useJournalController() {
   async function deleteById(req, res, next) {
     const id = req.params.id;
     if (!id) {
-      next(new BadRequestError102("Journal Entry ID is required."));
+      next(new BadRequestError106("Journal Entry ID is required."));
       return;
     }
     try {
@@ -21368,14 +21996,14 @@ function useJournalController() {
     const id = req.params.id;
     const status2 = req.params.status;
     const user = req.cookies.user;
-    const validation = Joi91.object({
-      id: Joi91.string().hex().required(),
-      status: Joi91.string().required(),
-      user: Joi91.string().hex().required()
+    const validation = Joi94.object({
+      id: Joi94.string().hex().required(),
+      status: Joi94.string().required(),
+      user: Joi94.string().hex().required()
     });
     const { error } = validation.validate({ id, status: status2, user });
     if (error) {
-      next(new BadRequestError102(error.message));
+      next(new BadRequestError106(error.message));
       return;
     }
     try {
@@ -21397,8 +22025,8 @@ function useJournalController() {
 }
 
 // src/resources/finance-journal-line/finance.journal.line.controller.ts
-import Joi92 from "joi";
-import { BadRequestError as BadRequestError103 } from "@goweekdays/utils";
+import Joi95 from "joi";
+import { BadRequestError as BadRequestError107 } from "@goweekdays/utils";
 function useJournalLineController() {
   const {
     getAll: _getAll,
@@ -21409,14 +22037,14 @@ function useJournalLineController() {
   } = useJournalLineRepo();
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi92.object({
-      org: Joi92.string().hex().required(),
-      JournalGeneral: Joi92.string().hex().optional(),
-      page: Joi92.number().min(1).optional().allow("", null),
-      limit: Joi92.number().min(1).optional().allow("", null),
-      account: Joi92.string().hex().optional().allow("", null),
-      search: Joi92.string().optional().allow("", null),
-      status: Joi92.string().valid("draft", "posted").optional().allow("", null)
+    const validation = Joi95.object({
+      org: Joi95.string().hex().required(),
+      JournalGeneral: Joi95.string().hex().optional(),
+      page: Joi95.number().min(1).optional().allow("", null),
+      limit: Joi95.number().min(1).optional().allow("", null),
+      account: Joi95.string().hex().optional().allow("", null),
+      search: Joi95.string().optional().allow("", null),
+      status: Joi95.string().valid("draft", "posted").optional().allow("", null)
     });
     const org = req.params.org ?? "";
     const JournalGeneral = req.query.JournalGeneral;
@@ -21432,15 +22060,15 @@ function useJournalLineController() {
       account
     });
     if (!isFinite(page)) {
-      next(new BadRequestError103("Invalid page number."));
+      next(new BadRequestError107("Invalid page number."));
       return;
     }
     if (!isFinite(limit)) {
-      next(new BadRequestError103("Invalid limit number."));
+      next(new BadRequestError107("Invalid limit number."));
       return;
     }
     if (error) {
-      next(new BadRequestError103(error.message));
+      next(new BadRequestError107(error.message));
       return;
     }
     try {
@@ -21461,12 +22089,12 @@ function useJournalLineController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi92.object({
-      id: Joi92.string().hex().required()
+    const validation = Joi95.object({
+      id: Joi95.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError103(error.message));
+      next(new BadRequestError107(error.message));
       return;
     }
     try {
@@ -21555,6 +22183,7 @@ export {
   modelJobSummary,
   modelJournal,
   modelJournalLine,
+  modelJournalTransaction,
   modelLedgerBill,
   modelMember,
   modelOption,
@@ -21624,6 +22253,11 @@ export {
   schemaJournalLineRepo,
   schemaJournalRepo,
   schemaJournalRepoUpdate,
+  schemaJournalTransactionAccount,
+  schemaJournalTransactionCtrl,
+  schemaJournalTransactionCtrlUpdate,
+  schemaJournalTransactionGetAll,
+  schemaJournalTransactionRepo,
   schemaLanguage,
   schemaLedgerBill,
   schemaLedgerBillingSummary,
@@ -21705,6 +22339,9 @@ export {
   useJournalLineRepo,
   useJournalRepo,
   useJournalService,
+  useJournalTransactionController,
+  useJournalTransactionRepo,
+  useJournalTransactionService,
   useLedgerBillingController,
   useLedgerBillingRepo,
   useMemberController,