@tomei/finance 0.1.4 → 0.1.5

package/migrations/finance-payment-item-migration.js

@@ -6,7 +6,6 @@ module.exports = {
       PaymentId: {
         type: Sequelize.STRING(30),
         allowNull: false,
-        primaryKey: true,
         references: {
           model: 'finance_Payment',
           key: 'PaymentId',
@@ -16,6 +15,7 @@ module.exports = {
       },
       PayForObjectId: {
         type: Sequelize.STRING(30),
+        primaryKey: true,
         allowNull: false,
       },
       PayForObjectType: {

package/package.json

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

package/src/account/account.ts

@@ -21,17 +21,18 @@ export class Account {
   RelatedObject: RelatedObject;
   AccountType: string;
   AccountSubType: string;
+  AccountingSystem: IAccountSystem;
 
   isParamsInitialized: boolean;
-  accessToken: string;
-  refreshToken: string;
 
   constructor(
     accountRepository: IAccountRepository,
+    accountingSystem: IAccountSystem,
     SysCode: string,
     params?: ICreateAccountAttr,
   ) {
     this.accountRepository = accountRepository;
+    this.AccountingSystem = accountingSystem;
     this.AccSystemId = getConfig().systemConfig[SysCode].accountingSystem;
     if (params) {
       this.init(params);
@@ -77,7 +78,7 @@ export class Account {
     }
   }
 
-  async create(userId: string, client: IAccountSystem, dbOptions: any) {
+  async create(userId: string) {
     try {
       if (!this.Owner || !this.RelatedObject) {
         throw new Error(
@@ -130,25 +131,24 @@ export class Account {
         };
       }
 
-      const accountId = await client.createAccount(createAccountPayload);
-
-      const account = await this.accountRepository.create(
-        {
-          AccountNo: accountId,
-          SystemCode: this.AccSystemId,
-          Name: this.Owner.FullName,
-          OwnerId: this.OwnerId,
-          OwnerType: this.OwnerType,
-          RelatedObjectId: this.RelatedObjectId,
-          RelatedObjectType: this.RelatedObjectType,
-          CreatedAt: new Date(),
-          CreatedById: userId,
-          UpdatedAt: new Date(),
-          UpdatedById: userId,
-        },
-        dbOptions,
+      const accountId = await this.AccountingSystem.createAccount(
+        createAccountPayload,
       );
 
+      const account = await this.accountRepository.create({
+        AccountNo: accountId,
+        SystemCode: this.AccSystemId,
+        Name: this.Owner.FullName,
+        OwnerId: this.OwnerId,
+        OwnerType: this.OwnerType,
+        RelatedObjectId: this.RelatedObjectId,
+        RelatedObjectType: this.RelatedObjectType,
+        CreatedAt: new Date(),
+        CreatedById: userId,
+        UpdatedAt: new Date(),
+        UpdatedById: userId,
+      });
+
       const payload = {
         Action: 'Create',
         Activity: 'Account Created',

package/src/payment/entities/payment-item.entity.ts

@@ -12,13 +12,13 @@ import { PaymentModel } from './payment.entity';
 export class PaymentItemModel extends Model {
   @ForeignKey(() => PaymentModel)
   @Column({
-    primaryKey: true,
     allowNull: false,
     type: DataType.STRING(30),
   })
   PaymentId: string;
 
   @Column({
+    primaryKey: true,
     allowNull: false,
     type: DataType.STRING(30),
   })

package/src/payment/interfaces/payment-params.interface.ts

@@ -0,0 +1,8 @@
+import { PaymentMethod, PaymentType } from '../../enum';
+
+export interface IPaymentParams {
+  Currency?: string;
+  Method?: PaymentMethod;
+  MethodParty?: string;
+  PaymentType?: PaymentType;
+}

package/src/payment/payment-item.repository.ts

@@ -24,6 +24,11 @@ export class PaymentItemRepository
     return this.paymentItemModel.create({ ...data }, options);
   }
 
+  bulkCreate(data: IPaymentItemAttr[], options?: any): any {
+    const payload: any = [...data];
+    return this.paymentItemModel.bulkCreate(payload, options);
+  }
+
   findAll(options: any): Promise<PaymentItemModel[]> {
     return this.paymentItemModel.findAll(options);
   }

package/src/payment/payment.ts

@@ -9,6 +9,7 @@ import { Sequelize } from 'sequelize-typescript';
 import { IPaymentAttr } from './interfaces/payment-attr.interface';
 import { PaymentModel } from './entities/payment.entity';
 import axios from 'axios';
+import { IPaymentParams } from './interfaces/payment-params.interface';
 export class Payment extends ObjectBase {
   Id: string;
   Name: string;
@@ -51,6 +52,7 @@ export class Payment extends ObjectBase {
     ReceivableAccount: Account,
     DepositAccount: Account,
     PaymentItems: PaymentItemBase[],
+    Params?: IPaymentParams,
     sequelize?: Sequelize,
   ) {
     super();
@@ -61,11 +63,21 @@ export class Payment extends ObjectBase {
     this.ReceivableAccount = ReceivableAccount;
     this.DepositAccount = DepositAccount;
     this.PaymentItems = PaymentItems;
+    if (Params) {
+      this.init(Params);
+    }
     if (sequelize) {
       this.sequelize = sequelize;
     }
   }
 
+  init(Params: IPaymentParams): void {
+    if (Params.Currency) this.Currency = Params.Currency;
+    if (Params.Method) this.Method = Params.Method;
+    if (Params.MethodParty) this.MethodParty = Params.MethodParty;
+    if (Params.PaymentType) this.PaymentType = Params.PaymentType;
+  }
+
   getAmount(): number {
     if (!this.Amount) {
       if (this.PaymentItems.length === 0) {
@@ -113,7 +125,6 @@ export class Payment extends ObjectBase {
       if (!this.sequelize) {
         throw new Error('sequelize instance used for transaction is required.');
       }
-
       if (!this.PaymentType) {
         throw new Error('Payment Type is required.');
       }
@@ -147,18 +158,19 @@ export class Payment extends ObjectBase {
       const payment = await this.PaymentRepository.create(paymentAttribute, {
         transaction,
       });
-
+      const paymentItemsData = [];
       this.PaymentItems.forEach(async (paymentItem) => {
-        await this.PaymentItemRepository.create(
-          {
-            PaymentId: this.Id,
-            PayForObjectId: paymentItem.Id,
-            PayForObjectType: paymentItem.Type,
-            Amount: paymentItem.Amount,
-            Currency: paymentItem.Currency,
-          },
-          { transaction },
-        );
+        paymentItemsData.push({
+          PaymentId: this.Id,
+          PayForObjectId: paymentItem.Id,
+          PayForObjectType: paymentItem.Type,
+          Amount: paymentItem.Amount,
+          Currency: paymentItem.Currency,
+        });
+      });
+
+      await this.PaymentItemRepository.bulkCreate(paymentItemsData, {
+        transaction,
       });
 
       const payload = {