@tomei/finance 0.3.6 → 0.3.8

package/package.json

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

package/src/customer/customer.ts

@@ -46,26 +46,28 @@ export default abstract class FinanceCustomerBase
   RepositoryBase: IRepositoryBase<any>;
 
   constructor(
-    custSystemRefId: string,
-    custSystemCode: string,
-    sFinanceCompanyId: string,
+    custSystemRefId?: string,
+    custSystemCode?: string,
+    sFinanceCompanyId?: string,
   ) {
     super();
-    const financeCustomerData =
-      FinanceCustomerBase._FinanceCustomerRepository.findOne({
-        where: {
-          CompanyId: sFinanceCompanyId,
-          CustSystemCode: custSystemCode,
-          CustSystemRefId: custSystemRefId,
-        },
-      });
-    if (financeCustomerData) {
-      this.CompanyId = sFinanceCompanyId;
-      this.CustSystemCode = custSystemCode;
-      this.CustSystemRefId = custSystemRefId;
-    } else {
-      const notFoundError = new RecordNotFoundError('No Record Found');
-      throw notFoundError;
+    if (custSystemRefId && custSystemCode && sFinanceCompanyId) {
+      const financeCustomerData =
+        FinanceCustomerBase._FinanceCustomerRepository.findOne({
+          where: {
+            CompanyId: sFinanceCompanyId,
+            CustSystemCode: custSystemCode,
+            CustSystemRefId: custSystemRefId,
+          },
+        });
+      if (financeCustomerData) {
+        this.CompanyId = sFinanceCompanyId;
+        this.CustSystemCode = custSystemCode;
+        this.CustSystemRefId = custSystemRefId;
+      } else {
+        const notFoundError = new RecordNotFoundError('No Record Found');
+        throw notFoundError;
+      }
     }
   }
 
@@ -85,8 +87,12 @@ export default abstract class FinanceCustomerBase
 
   async save(
     customerId: string,
+    custSystemCode: string,
+    custSystemRefId: string,
     dbTransaction?: any,
   ): Promise<FinanceCustomerModel> {
+    this.CustSystemCode = custSystemCode;
+    this.CustSystemRefId = custSystemRefId;
     const data = await FinanceCustomerBase._FinanceCustomerRepository.create(
       {
         CustomerId: customerId,

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

@@ -36,10 +36,10 @@ export default class FinanceCompany extends ObjectBase {
   private static _PaymentItemRepository = new PaymentItemRepository();
   private static _DocumentRepository = new DocumentRepository();
   private static _DocumentItemRepository = new DocumentItemRepository();
-
-  financeCustomerRepository: FinanceCustomerRepository;
-  ledgerTransactionRepository: LedgerTransactionRepository;
-  AccountingSystem: IAccountSystem;
+  private static _FinanceCustomerRepository = new FinanceCustomerRepository();
+  private static _LedgerTransactionRepository =
+    new LedgerTransactionRepository();
+  private _AccountingSystem: IAccountSystem;
 
   get CompSystemCode(): string {
     return this._CompSystemCode;
@@ -85,6 +85,14 @@ export default class FinanceCompany extends ObjectBase {
     return 'finance_Company';
   }
 
+  get AccountingSystem(): IAccountSystem {
+    return this._AccountingSystem;
+  }
+
+  set AccountingSystem(system: IAccountSystem) {
+    this._AccountingSystem = system;
+  }
+
   constructor(
     compSystemCode: string,
     compSystemRefId: string,
@@ -165,6 +173,7 @@ export default class FinanceCompany extends ObjectBase {
 
       /*Retrieve and store the CompanyId from the result*/
       financeCompany.ObjectId = company.CompanyId;
+      financeCompany._CompanyId = company.CompanyId;
 
       /*Add the details into the hashtable*/
       const sKey = `${compSystemCode}-${compSystemRefId}-${accSystemCode}`;
@@ -246,15 +255,14 @@ export default class FinanceCompany extends ObjectBase {
         );
       }
 
-      const financeCustomerData = await this.financeCustomerRepository.findOne({
-        where: {
-          /*todo:verify SystemCode*/
-          // SystemCode: this.SystemCode,
-          AccSystemCode: this.AccSystemCode,
-          AccSystemCustomerId: custSystemCode,
-          CustomerRefId: custSystemRefId,
-        },
-      });
+      const financeCustomerData =
+        await FinanceCompany._FinanceCustomerRepository.findOne({
+          where: {
+            CompanyId: this._CompanyId,
+            CustSystemCode: custSystemCode,
+            CustSystemRefId: custSystemRefId,
+          },
+        });
 
       if (financeCustomerData) {
         throw new Error('Customer already created previously.');
@@ -265,7 +273,12 @@ export default class FinanceCompany extends ObjectBase {
         customer,
       });
 
-      const newCustomer = await customer.save(customerId, dbTransaction);
+      const newCustomer = await customer.save(
+        customerId,
+        custSystemCode,
+        custSystemRefId,
+        dbTransaction,
+      );
 
       const payload = {
         Action: 'Create',
@@ -315,7 +328,7 @@ export default class FinanceCompany extends ObjectBase {
       const newJournalEntry = await journalEntry.save('test', dbTransaction);
 
       const allLedgerTransactions =
-        await this.ledgerTransactionRepository.findAll({});
+        await FinanceCompany._LedgerTransactionRepository.findAll({});
 
       for (const ledgerTransaction of allLedgerTransactions) {
         ledgerTransaction.JournalEntryId = newJournalEntry.JournalEntryId;