@tomei/finance 0.3.91 → 0.3.93

package/package.json

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

package/src/account/account.ts

@@ -201,13 +201,20 @@ export default class Account extends AccountSystemEntity {
     dbTransaction?: any,
   ): Promise<AccountModel> {
     this.AccSystemRefId = AccSystemRefId;
+    console.log('Account Save: Before AccountNo FindOne');
+
     let data = await this.RepositoryBase.findOne({
       where: {
         AccountNo: this.AccountNo,
       },
       transaction: dbTransaction,
     });
+    console.log('Account Save: After AccountNo FindOne');
+    console.log(data, '<><><><><> Account Data Result <><><><><><>');
+
     if (data) {
+      console.log('Account Save: THERE IS DATA FOUND');
+
       this.AccountNo = data.AccountNo;
       this.AccSystemRefId = data.AccSystemRefId;
       this.Name = data.Name;
@@ -223,6 +230,8 @@ export default class Account extends AccountSystemEntity {
       this.CreatedAt = data.CreatedAt;
       this.CreatedById = data.CreatedById;
     } else {
+      console.log('Account Save: THERE IS NO DATA FOUND');
+
       data = await this.RepositoryBase.create(
         {
           AccountNo: this.AccountNo,
@@ -244,8 +253,12 @@ export default class Account extends AccountSystemEntity {
           transaction: dbTransaction,
         },
       );
+
+      console.log(data, '<><><><><><><> DATA THAT GETS CREATED <><><><><><><>');
     }
 
+    console.log(data, 'Account Save: Account details returned');
+
     return data;
   }
 }

package/src/customer/customer.ts

@@ -38,6 +38,8 @@ export default abstract class FinanceCustomerBase
   private _AccountReceivable: Account;
   private _AccountPayable: Account;
 
+  protected _DbTransaction: any;
+
   private static _AccountRepository = new AccountRepository();
 
   // note: getDetails from spec is void type. Meaning that this probably needed a fix soon
@@ -91,7 +93,12 @@ export default abstract class FinanceCustomerBase
     custSystemRefId: string,
     custSystemCode: string,
     sFinanceCompanyId: string,
+    dbTransaction?: any,
   ): Promise<C> {
+    if (!dbTransaction) {
+      dbTransaction = await FinanceDb.getConnection().transaction();
+    }
+
     const financeCustomerData =
       await FinanceCustomerBase._FinanceCustomerRepository.findOne({
         where: {
@@ -99,9 +106,11 @@ export default abstract class FinanceCustomerBase
           CustSystemCode: custSystemCode,
           CustSystemRefId: custSystemRefId,
         },
+        transaction: dbTransaction,
       });
     if (financeCustomerData) {
       const self = new this();
+      self._DbTransaction = dbTransaction;
       self.CustomerId = financeCustomerData.CustomerId;
       self.CompanyId = sFinanceCompanyId;
       self.CustSystemCode = custSystemCode;
@@ -119,90 +128,101 @@ export default abstract class FinanceCustomerBase
 
   get AccountReceivable(): Promise<Account> {
     return new Promise((resolve, reject) => {
-      let transaction;
+      let transaction = this._DbTransaction;
       if (this._AccountReceivable) {
         resolve(this._AccountReceivable);
       } else {
-        FinanceDb.getConnection()
-          .transaction()
-          .then((t) => {
-            transaction = t;
-            return FinanceCustomerBase._AccountRepository.findOne({
+        // FinanceDb.getConnection()
+        //   .transaction()
+        // transaction
+        //   .then((t) => {
+        //     transaction = t;
+        return (
+          FinanceCustomerBase._AccountRepository
+            .findOne({
               where: {
                 AccountType: 'Account Receivable',
                 OwnerId: this.CustomerId,
                 OwnerType: type(this),
               },
-            });
-          })
-          .then((accountData) => {
-            this._AccountReceivable = new Account(transaction);
-            if (accountData) {
-              this._AccountReceivable.AccountNo = accountData.AccountNo;
-              this._AccountReceivable.ParentAccountNo =
-                accountData.ParentAccountNo;
-              this._AccountReceivable.AccountType = accountData.AccountType;
-              this._AccountReceivable.OwnerId = accountData.OwnerId;
-              this._AccountReceivable.OwnerType = accountData.OwnerType;
-            } else {
-              // this._AccountReceivable.AccountNo = `${this.CustSystemCode}-AR-123456789`;
-              // this._AccountReceivable.ParentAccountNo = `${this.CustSystemCode}-AR`;
-              this._AccountReceivable.AccountNo = this.ARAccountNo; //SystemInfo.SYSTEM_CODE + '-AR-' + '8 digit running no'
-              this._AccountReceivable.ParentAccountNo = this.ParentARAccountNo; //SystemInfo.SYSTEM_CODE + '-AR'
-              this._AccountReceivable.AccountType = 'Account Receivable';
-              this._AccountReceivable.OwnerId = this.CustomerId;
-              this._AccountReceivable.OwnerType = type(this);
-            }
-            resolve(this._AccountReceivable);
-          })
-          .catch((err) => {
-            reject(err);
-          });
+              transaction,
+            })
+            // })
+            .then((accountData) => {
+              this._AccountReceivable = new Account(transaction);
+              if (accountData) {
+                this._AccountReceivable.AccountNo = accountData.AccountNo;
+                this._AccountReceivable.ParentAccountNo =
+                  accountData.ParentAccountNo;
+                this._AccountReceivable.AccountType = accountData.AccountType;
+                this._AccountReceivable.OwnerId = accountData.OwnerId;
+                this._AccountReceivable.OwnerType = accountData.OwnerType;
+              } else {
+                // this._AccountReceivable.AccountNo = `${this.CustSystemCode}-AR-123456789`;
+                // this._AccountReceivable.ParentAccountNo = `${this.CustSystemCode}-AR`;
+                this._AccountReceivable.AccountNo = this.ARAccountNo; //SystemInfo.SYSTEM_CODE + '-AR-' + '8 digit running no'
+                this._AccountReceivable.ParentAccountNo =
+                  this.ParentARAccountNo; //SystemInfo.SYSTEM_CODE + '-AR'
+                this._AccountReceivable.AccountType = 'Account Receivable';
+                this._AccountReceivable.OwnerId = this.CustomerId;
+                this._AccountReceivable.OwnerType = type(this);
+              }
+              resolve(this._AccountReceivable);
+            })
+            .catch((err) => {
+              reject(err);
+            })
+        );
       }
     });
   }
 
   get AccountPayable(): Promise<Account> {
     return new Promise((resolve, reject) => {
-      let transaction;
+      let transaction = this._DbTransaction;
       if (this._AccountPayable) {
         resolve(this._AccountPayable);
       } else {
-        FinanceDb.getConnection()
-          .transaction()
-          .then((t) => {
-            transaction = t;
-            return FinanceCustomerBase._AccountRepository.findOne({
+        // FinanceDb.getConnection()
+        //   .transaction()
+        // transaction
+        //   .then((t) => {
+        //     transaction = t;
+        return (
+          FinanceCustomerBase._AccountRepository
+            .findOne({
               where: {
                 AccountType: 'Account Payable',
                 OwnerId: this.CustomerId,
                 OwnerType: type(this),
               },
-            });
-          })
-          .then((accountData) => {
-            this._AccountPayable = new Account(transaction);
-            if (accountData) {
-              this._AccountPayable.AccountNo = accountData.AccountNo;
-              this._AccountPayable.ParentAccountNo =
-                accountData.ParentAccountNo;
-              this._AccountPayable.AccountType = accountData.AccountType;
-              this._AccountPayable.OwnerId = accountData.OwnerId;
-              this._AccountPayable.OwnerType = accountData.OwnerType;
-            } else {
-              // this._AccountPayable.AccountNo = `${this.CustSystemCode}-AP-123456789`;
-              // this._AccountPayable.ParentAccountNo = `${this.CustSystemCode}-AP`;
-              this._AccountPayable.AccountNo = this.APAccountNo; //SystemInfo.SYSTEM_CODE + '-AP-' + '8 digit running no'
-              this._AccountPayable.ParentAccountNo = this.ParentAPAccountNo; //SystemInfo.SYSTEM_CODE + '-AP'
-              this._AccountPayable.AccountType = 'Account Payable';
-              this._AccountPayable.OwnerId = this.CustomerId;
-              this._AccountPayable.OwnerType = type(this);
-            }
-            resolve(this._AccountPayable);
-          })
-          .catch((err) => {
-            reject(err);
-          });
+              transaction,
+            })
+            // })
+            .then((accountData) => {
+              this._AccountPayable = new Account(transaction);
+              if (accountData) {
+                this._AccountPayable.AccountNo = accountData.AccountNo;
+                this._AccountPayable.ParentAccountNo =
+                  accountData.ParentAccountNo;
+                this._AccountPayable.AccountType = accountData.AccountType;
+                this._AccountPayable.OwnerId = accountData.OwnerId;
+                this._AccountPayable.OwnerType = accountData.OwnerType;
+              } else {
+                // this._AccountPayable.AccountNo = `${this.CustSystemCode}-AP-123456789`;
+                // this._AccountPayable.ParentAccountNo = `${this.CustSystemCode}-AP`;
+                this._AccountPayable.AccountNo = this.APAccountNo; //SystemInfo.SYSTEM_CODE + '-AP-' + '8 digit running no'
+                this._AccountPayable.ParentAccountNo = this.ParentAPAccountNo; //SystemInfo.SYSTEM_CODE + '-AP'
+                this._AccountPayable.AccountType = 'Account Payable';
+                this._AccountPayable.OwnerId = this.CustomerId;
+                this._AccountPayable.OwnerType = type(this);
+              }
+              resolve(this._AccountPayable);
+            })
+            .catch((err) => {
+              reject(err);
+            })
+        );
       }
     });
   }

package/src/finance-company/finance-company.ts

@@ -429,10 +429,20 @@ export default class FinanceCompany extends ObjectBase {
         };
       }
 
+      console.log(
+        'Finance Company Create Account: Before accSystemAccountId Create',
+      );
+
       const accSystemAccountId = await this.AccountingSystem.createAccount(
         createAccountPayload,
       );
+
+      console.log(
+        'Finance Company Create Account: After accSystemAccountId Create',
+      );
+
       account.PostedToAccSystemYN = 'Y';
+      console.log('Finance Company Create Account: Before new Account Create');
       const newAccount = await account.save(
         this.CompanyId,
         accSystemAccountId,
@@ -440,6 +450,8 @@ export default class FinanceCompany extends ObjectBase {
         dbTransaction,
       );
 
+      console.log('Finance Company Create Account: After new Account Create');
+
       const payload = {
         Action: 'Create',
         Activity: 'Account Created',