@tomei/finance 0.3.19 → 0.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/finance",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "description": "NestJS package for finance module",
   "main": "dist/index.js",
   "scripts": {

package/src/journal-entry/journal-entry.ts

@@ -19,11 +19,9 @@ export default class JournalEntry extends AccountSystemEntity {
   private static _LedgerTransactionRepository =
     new LedgerTransactionRepository();
 
-  ledgerTransactionRepository: LedgerTransactionRepository;
-
   private _DbTransaction: any;
-  private _DebitTransactions = null;
-  private _CreditTransactions = null;
+  private _DebitTransactions: LedgerTransaction[] = [];
+  private _CreditTransactions: LedgerTransaction[] = [];
 
   get JournalEntryId() {
     return this._JournalEntryId;
@@ -79,6 +77,18 @@ export default class JournalEntry extends AccountSystemEntity {
         .catch((err) => {
           console.log('Journal entry constructor err: ', err);
         });
+    } else {
+      this.init({
+        JournalEntryId: cuid(),
+        CompanyId: this.CompanyId,
+        Date: new Date(),
+        Name: '',
+        Description: '',
+        AccSystemRefId: '',
+        PostedToAccSystemYN: 'N',
+        PostedById: '',
+        PostedDateTime: null,
+      });
     }
   }
 
@@ -97,12 +107,11 @@ export default class JournalEntry extends AccountSystemEntity {
           })
           .then((debitTransactions) => {
             const debitTransactionObjects = debitTransactions.map(
-              (debitTransactionData) => {
-                new LedgerTransaction(
+              (debitTransactionData) => new LedgerTransaction(
                   this._DbTransaction,
                   debitTransactionData.TransactionId,
-                );
-              },
+                )
+              
             );
             return Promise.all(debitTransactionObjects);
           })
@@ -133,12 +142,12 @@ export default class JournalEntry extends AccountSystemEntity {
           })
           .then((creditTransaction) => {
             const creditTransactionObjects = creditTransaction.map(
-              (creditTransactionData) => {
+              (creditTransactionData) => 
                 new LedgerTransaction(
                   this._DbTransaction,
                   creditTransactionData.TransactionId,
-                );
-              },
+                )
+              
             );
             return Promise.all(creditTransactionObjects);
           })
@@ -258,33 +267,18 @@ export default class JournalEntry extends AccountSystemEntity {
   async newLedgerTransaction(
     transactionType: TransactionTypeOptions,
   ): Promise<LedgerTransaction> {
-    this.init({
-      JournalEntryId: cuid(),
-      CompanyId: this.CompanyId,
-      Date: new Date(),
-      Name: '',
-      Description: '',
-      AccSystemRefId: '',
-      PostedToAccSystemYN: 'N',
-      PostedById: '',
-      PostedDateTime: null,
-    });
 
     const ledgerTransaction = new LedgerTransaction(
-      this.ledgerTransactionRepository,
-    );
-
-    const newLedgerTransaction = await ledgerTransaction.newLedgerTransaction(
-      transactionType,
-      this.JournalEntryId,
+      this._DbTransaction,
     );
+    ledgerTransaction.JournalEntryId = this.JournalEntryId;
 
     if (transactionType === TransactionTypeOptions.DEBIT) {
-      this.DebitTransactions;
+      this._DebitTransactions.push(ledgerTransaction);
     } else if (transactionType === TransactionTypeOptions.CREDIT) {
-      this.CreditTransactions;
+      this._CreditTransactions.push(ledgerTransaction);
     }
 
-    return newLedgerTransaction;
+    return ledgerTransaction;
   }
 }

package/src/ledger-transaction/ledger-transaction.ts

@@ -17,10 +17,16 @@ export default class LedgerTransaction {
   RelatedObjectType: string;
 
   TransactionType: string;
+  private _DbTransaction: any;
 
-  ledgerTransactionRepository: LedgerTransactionRepository;
+  private static _LedgerTransactionRepository =
+    new LedgerTransactionRepository();
 
-  constructor(dbTransaction?: any, transactionId?: string) {}
+  constructor(dbTransaction?: any, transactionId?: string) {
+    if(dbTransaction){
+      this._DbTransaction = dbTransaction;
+    }
+  }
 
   init(params?: ILedgerTransactionAttr) {
     this.TransactionId = params.TransactionId;
@@ -55,7 +61,7 @@ export default class LedgerTransaction {
   }
 
   async create() {
-    return await this.ledgerTransactionRepository.create(this.getData);
+    return await  LedgerTransaction._LedgerTransactionRepository.create(this.getData, {transaction: this._DbTransaction});
   }
 
   async newLedgerTransaction(
@@ -65,7 +71,8 @@ export default class LedgerTransaction {
     this.init({
       TransactionId: cuid(),
       TransactionType: transactionType,
-      JournalEntryId: '',
+      JournalEntryId: journalEntryId,
+      //TODO: AccountNo should be Filled In. Not sure with What
       AccountNo: '',
       Date: new Date(),
       Name: '',