@tomei/finance 0.5.6 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/finance",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "description": "NestJS package for finance module",
   "main": "dist/index.js",
   "scripts": {
@@ -35,12 +35,12 @@
     "@nestjs/platform-express": "^9.0.8",
     "@nestjs/sequelize": "^9.0.0",
     "@nestjs/swagger": "^6.1.4",
-    "@tomei/general": "^0.0.26",
+    "@tomei/general": "^0.5.1",
     "@tomei/media": "^0.4.2",
     "axios": "^1.1.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
-    "cuid": "^2.1.8",
+    "cuid": "^3.0.0",
     "dotenv": "^16.0.3",
     "intuit-oauth": "^4.0.0",
     "mariadb": "^3.0.2",
@@ -57,7 +57,7 @@
     "eslint": "^8.21.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "husky": "^7.0.2",
+    "husky": "^8.0.3",
     "lint-staged": "^11.1.2",
     "mariadb": "^3.0.2",
     "prettier": "^2.7.1",
@@ -75,5 +75,9 @@
       "npm run build",
       "git add ."
     ]
+  },
+  "dependencies": {
+    "@tomei/activity-history": "^0.2.1",
+    "@tomei/sso": "^0.11.6"
   }
 }

package/src/account/account.ts

@@ -1,4 +1,4 @@
-import { RecordNotFoundError } from '@tomei/general';
+import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
 import { AccountSystemEntity } from '../account-system-entity/account-system-entity';
 import AccountModel from '../models/account.entity';
 import { AccountRepository } from './account.repository';
@@ -87,7 +87,10 @@ export default class Account extends AccountSystemEntity {
             this.PostedById = accountData.PostedById;
             this.PostedDateTime = accountData.PostedDateTime;
           } else {
-            const notFoundError = new RecordNotFoundError('No Record Found.');
+            const notFoundError = new RecordNotFoundError(
+              'AccountErrMsg',
+              'No Record Found.',
+            );
             throw notFoundError;
           }
         })
@@ -136,7 +139,10 @@ export default class Account extends AccountSystemEntity {
         account.init(accountData.get({ plain: true }));
         return account;
       } else {
-        const notFoundError = new RecordNotFoundError('No Record Found.');
+        const notFoundError = new RecordNotFoundError(
+          'AccountErrMsg',
+          'No Record Found.',
+        );
         throw notFoundError;
       }
     } catch (error) {

package/src/customer/customer.ts

@@ -3,8 +3,8 @@ import {
   IRepositoryBase,
   IPerson,
   LoginUserBase,
-  RecordNotFoundError,
 } from '@tomei/general';
+import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
 import FinanceCustomerModel from '../models/customer.entity';
 import { AccountSystemEntity } from '../account-system-entity/account-system-entity';
 import { FinanceCustomerRepository } from './finance-customer.repository';
@@ -85,7 +85,10 @@ export default abstract class FinanceCustomerBase
         this.CustSystemCode = custSystemCode;
         this.CustSystemRefId = custSystemRefId;
       } else {
-        const notFoundError = new RecordNotFoundError('No Record Found');
+        const notFoundError = new RecordNotFoundError(
+          'FinanceCustomerErrMsg',
+          'No Record Found',
+        );
         throw notFoundError;
       }
     }
@@ -124,102 +127,92 @@ export default abstract class FinanceCustomerBase
       self.PostedDateTime = financeCustomerData.PostedDateTime;
       return self;
     } else {
-      const notFoundError = new RecordNotFoundError('No Record Found');
+      const notFoundError = new RecordNotFoundError(
+        'FinanceCustomerErrMsg',
+        'No Record Found',
+      );
       throw notFoundError;
     }
   }
 
-  get AccountReceivable(): Promise<Account> {
-    return new Promise((resolve, reject) => {
+  async getAccountReceivable(): Promise<Account> {
+    try {
       const transaction = this._DbTransaction;
       if (this._AccountReceivable) {
-        resolve(this._AccountReceivable);
+        return this._AccountReceivable;
       } else {
-        return (
-          FinanceCustomerBase._AccountRepository
-            .findOne({
-              where: {
-                AccountNo: this.ARAccountNo,
-                AccountType: 'Account Receivable',
-                OwnerId: this.CustomerId,
-                OwnerType: type(this),
-              },
-              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);
-            })
-        );
+        const accountData =
+          await FinanceCustomerBase._AccountRepository.findOne({
+            where: {
+              AccountNo: this.ARAccountNo,
+              AccountType: 'Account Receivable',
+              OwnerId: this.CustomerId,
+              OwnerType: type(this),
+            },
+            transaction,
+          });
+        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);
+        }
+        return this._AccountReceivable;
       }
-    });
+    } catch (error) {
+      throw error;
+    }
   }
 
-  get AccountPayable(): Promise<Account> {
-    return new Promise((resolve, reject) => {
+  async getAccountPayable(): Promise<Account> {
+    try {
       const transaction = this._DbTransaction;
       if (this._AccountPayable) {
-        resolve(this._AccountPayable);
+        return this._AccountPayable;
       } else {
-        return (
-          FinanceCustomerBase._AccountRepository
-            .findOne({
-              where: {
-                AccountNo: this.APAccountNo,
-                AccountType: 'Account Payable',
-                OwnerId: this.CustomerId,
-                OwnerType: type(this),
-              },
-              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);
-            })
-        );
+        const accountData =
+          await FinanceCustomerBase._AccountRepository.findOne({
+            where: {
+              AccountNo: this.APAccountNo,
+              AccountType: 'Account Payable',
+              OwnerId: this.CustomerId,
+              OwnerType: type(this),
+            },
+            transaction,
+          });
+
+        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);
+        }
+
+        return this._AccountPayable;
       }
-    });
+    } catch (error) {
+      throw error;
+    }
   }
 
   /*
@@ -290,7 +283,7 @@ export default abstract class FinanceCustomerBase
       dbTransaction = await FinanceDb.getConnection().transaction();
     }
 
-    const AR = await this.AccountReceivable;
+    const AR = await this.getAccountReceivable();
 
     const ledgerTransactions =
       await FinanceCustomerBase._LedgerTransactionRepository.findAll({

package/src/document/document.ts

@@ -1,7 +1,7 @@
 import * as util from 'util';
 import * as fs from 'fs';
 import * as puppeteer from 'puppeteer';
-import { RecordNotFoundError } from '@tomei/general';
+import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
 import {
   Medias,
   InternalMediaDto,
@@ -167,7 +167,10 @@ export default class Document extends AccountSystemEntity {
             this.UseAccSystemDocYN = documentData.UseAccSystemDocYN;
             this.IsNewRecord = false;
           } else {
-            const notFoundError = new RecordNotFoundError('No Record Found.');
+            const notFoundError = new RecordNotFoundError(
+              'FinanceDocumentErrMsg',
+              'No Record Found.',
+            );
             throw notFoundError;
           }
         })
@@ -212,7 +215,10 @@ export default class Document extends AccountSystemEntity {
       document.UseAccSystemDocYN = documentData.UseAccSystemDocYN;
       document.IsNewRecord = false;
     } else {
-      const notFoundError = new RecordNotFoundError('No Record Found.');
+      const notFoundError = new RecordNotFoundError(
+        'FinanceDocumentErrMsg',
+        'No Record Found.',
+      );
       throw notFoundError;
     }
     return document;

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

@@ -34,6 +34,8 @@ import { PaymentPaidWithRepository } from '../payment-paid-with/payment-paid-wit
 import { MediasModel } from '@tomei/media';
 import DocumentItem from '../document/document-item';
 import { type } from '../helpers/typeof';
+import { LoginUser } from '@tomei/sso';
+import { ActionEnum, Activity } from '@tomei/activity-history';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const getConfig = require('../config');
@@ -278,7 +280,7 @@ export default class FinanceCompany extends ObjectBase {
     custSystemCode: string,
     custSystemRefId: string,
     customer: FinanceCustomerBase,
-    loginUser: LoginUserBase,
+    loginUser: LoginUser,
   ) {
     try {
       if (!custSystemCode || !custSystemRefId) {
@@ -314,22 +316,15 @@ export default class FinanceCompany extends ObjectBase {
         dbTransaction,
       );
 
-      const payload = {
-        Action: 'Create',
-        Activity: 'Finance Customer Created',
-        Description: `Customer (ID: ${newCustomer.CustomerId}) has been created for ${this.AccSystemCode}`,
-        EntityType: 'finance_Customer',
-        EntityValueBefore: JSON.stringify({}),
-        EntityValueAfter: JSON.stringify(newCustomer),
-        PerformedById: loginUser.ObjectId,
-        PerformedAt: new Date(),
-        EntityId: newCustomer.CustomerId,
-      };
+      const activity = new Activity();
+      activity.Action = ActionEnum.ADD;
+      activity.Description = 'Add Finance Customer';
+      activity.EntityType = 'FinanceCustomer';
+      activity.EntityId = newCustomer.CustomerId;
+      activity.EntityValueBefore = JSON.stringify({});
+      activity.EntityValueAfter = JSON.stringify(newCustomer);
 
-      await axios.post(
-        `${process.env.COMMON_API_URL}/activity-histories`,
-        payload,
-      );
+      await activity.create(loginUser, dbTransaction);
 
       return customer;
     } catch (error) {
@@ -680,7 +675,8 @@ export default class FinanceCompany extends ObjectBase {
           dt.AccountNo = dtAccountNo;
         } else {
           /*Transacting based on default customer AR account*/
-          dt.AccountNo = (await customer.AccountReceivable).AccountNo;
+          const arAccount = await customer.getAccountReceivable();
+          dt.AccountNo = arAccount.AccountNo;
         }
 
         dt.Currency = currency ? currency : 'MYR';
@@ -895,7 +891,8 @@ export default class FinanceCompany extends ObjectBase {
           dt.AccountNo = dtAccountNo;
         } else {
           /*Transacting based on default customer AR account*/
-          dt.AccountNo = (await customer.AccountReceivable).AccountNo;
+          const arAccount = await customer.getAccountReceivable();
+          dt.AccountNo = arAccount.AccountNo;
         }
 
         dt.Currency = currency ? currency : 'MYR';
@@ -1401,7 +1398,8 @@ export default class FinanceCompany extends ObjectBase {
         if (ctAccountNo) {
           creditLT.AccountNo = ctAccountNo;
         } else {
-          creditLT.AccountNo = (await customer.AccountReceivable).AccountNo;
+          const arAccount = await customer.getAccountReceivable();
+          creditLT.AccountNo = arAccount.AccountNo;
         }
         creditLT.Currency = paymentPaidWith.Currency;
         creditLT.CreditAmount = paymentPaidWith.Amount;
@@ -1562,7 +1560,8 @@ export default class FinanceCompany extends ObjectBase {
           if (dtAccountNo) {
             debitLT.AccountNo = dtAccountNo;
           } else {
-            debitLT.AccountNo = (await customer.AccountPayable).AccountNo;
+            const apAccount = await customer.getAccountPayable();
+            debitLT.AccountNo = apAccount.AccountNo;
           }
           debitLT.Currency = paymentPaidWithItem.Currency;
           debitLT.DebitAmount = paymentPaidWithItem.Amount;

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

@@ -6,7 +6,7 @@ import { AccountSystemEntity } from '../account-system-entity/account-system-ent
 import { LedgerTransactionRepository } from '../ledger-transaction/ledger-transaction.repository';
 import LedgerTransaction from '../ledger-transaction/ledger-transaction';
 import { JournalEntryRepository } from './journal-entry.repository';
-import { RecordNotFoundError } from '@tomei/general';
+import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
 
 export default class JournalEntry extends AccountSystemEntity {
   private _JournalEntryId = 'New';
@@ -69,7 +69,10 @@ export default class JournalEntry extends AccountSystemEntity {
             this.PostedById = journalEntryData.PostedById;
             this.PostedDateTime = journalEntryData.PostedDateTime;
           } else {
-            const notFoundError = new RecordNotFoundError('No Record Found.');
+            const notFoundError = new RecordNotFoundError(
+              'JournalEntryErrMsg',
+              'No Record Found.',
+            );
             throw notFoundError;
           }
         })

package/src/payment/payment.ts

@@ -1,4 +1,5 @@
-import { ObjectBase, RecordNotFoundError } from '@tomei/general';
+import { ObjectBase } from '@tomei/general';
+import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
 import { PaymentType } from '../enum';
 import { IPaymentParams } from './interfaces/payment-params.interface';
 import { AccountSystemEntity } from '../account-system-entity/account-system-entity';
@@ -111,7 +112,10 @@ export default class Payment extends AccountSystemEntity {
         payment.PostedDateTime = paymentData.PostedDateTime;
         return payment;
       } else {
-        const notFoundError = new RecordNotFoundError('No Record Found.');
+        const notFoundError = new RecordNotFoundError(
+          'PaymentErrMsg',
+          'No Record Found.',
+        );
         throw notFoundError;
       }
     } catch (error) {

package/src/payment-method/payment-method.ts

@@ -1,4 +1,5 @@
-import { ObjectBase, RecordNotFoundError } from '@tomei/general';
+import { ObjectBase } from '@tomei/general';
+import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
 import { PaymentMethodRepository } from './payment-method.repository';
 import PaymentMethodType from '../payment-method-type/payment-method-type';
 import { PaymentMethodTypeRepository } from '../payment-method-type/payment-method-type.repository';
@@ -34,7 +35,10 @@ export default class PaymentMethod extends ObjectBase {
           if (methodData) {
             this.Name = methodData.Name;
           } else {
-            throw new RecordNotFoundError('No record found.');
+            throw new RecordNotFoundError(
+              'PaymentMethodErrMsg',
+              'No record found.',
+            );
           }
         })
         .catch((err) => {

package/src/payment-method-type/payment-method-type.ts

@@ -1,4 +1,5 @@
-import { ObjectBase, RecordNotFoundError } from '@tomei/general';
+import { ObjectBase } from '@tomei/general';
+import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
 import { PaymentMethodTypeRepository } from './payment-method-type.repository';
 
 export default class PaymentMethodType extends ObjectBase {
@@ -47,7 +48,10 @@ export default class PaymentMethodType extends ObjectBase {
           paymentMethodTypeData.ProcessingFeeAccountNo;
         return paymentMethodType;
       } else {
-        const notFoundError = new RecordNotFoundError('No Record Found.');
+        const notFoundError = new RecordNotFoundError(
+          'PaymentMethodTypeErrMsg',
+          'No Record Found.',
+        );
         throw notFoundError;
       }
     } catch (error) {