@tomei/finance 0.3.2 → 0.3.4

package/package.json

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

package/src/customer/customer.ts

@@ -6,8 +6,8 @@ import {
   RecordNotFoundError,
 } from '@tomei/general';
 import FinanceCustomerModel from '../models/customer.entity';
-import { IFinanceCustomerRepository } from './interfaces/finance-customer.repository.interface';
 import { AccountSystemEntity } from '../account-system-entity/account-system-entity';
+import { FinanceCustomerRepository } from './finance-customer.repository';
 
 // const AccountSystemEntity = import('../account-system-entity').then(({AccountSystemEntity}) => AccountSystemEntity);
 export default abstract class FinanceCustomerBase
@@ -38,7 +38,7 @@ export default abstract class FinanceCustomerBase
     };
   }
 
-  financeCustomerRepository: IFinanceCustomerRepository;
+  protected static _FinanceCustomerRepository = new FinanceCustomerRepository();
 
   CustomerId: string;
   CustSystemCode: string;
@@ -51,13 +51,14 @@ export default abstract class FinanceCustomerBase
     sFinanceCompanyId: string,
   ) {
     super();
-    const financeCustomerData = this.financeCustomerRepository.findOne({
-      where: {
-        CompanyId: sFinanceCompanyId,
-        CustSystemCode: custSystemCode,
-        CustSystemRefId: custSystemRefId,
-      },
-    });
+    const financeCustomerData =
+      FinanceCustomerBase._FinanceCustomerRepository.findOne({
+        where: {
+          CompanyId: sFinanceCompanyId,
+          CustSystemCode: custSystemCode,
+          CustSystemRefId: custSystemRefId,
+        },
+      });
     if (financeCustomerData) {
       this.CompanyId = sFinanceCompanyId;
       this.CustSystemCode = custSystemCode;
@@ -86,7 +87,7 @@ export default abstract class FinanceCustomerBase
     customerId: string,
     dbTransaction?: any,
   ): Promise<FinanceCustomerModel> {
-    const data = await this.financeCustomerRepository.create(
+    const data = await FinanceCustomerBase._FinanceCustomerRepository.create(
       {
         CustomerId: customerId,
         CustSystemCode: this.CustSystemCode,

package/src/customer/finance-customer.repository.ts

@@ -1,30 +1,13 @@
 import { Injectable } from '@nestjs/common/decorators';
-import { InjectModel } from '@nestjs/sequelize';
-import { RepositoryBase } from '@tomei/general';
+import { RepositoryBase, IRepositoryBase } from '@tomei/general';
 import FinanceCustomerModel from '../models/customer.entity';
-import { IFinanceCustomerAttr } from './interfaces/finance-customer-attr.interface';
-import { IFinanceCustomerRepository } from './interfaces/finance-customer.repository.interface';
 
 @Injectable()
 export class FinanceCustomerRepository
   extends RepositoryBase<FinanceCustomerModel>
-  implements IFinanceCustomerRepository
+  implements IRepositoryBase<FinanceCustomerModel>
 {
-  constructor(
-    @InjectModel(FinanceCustomerModel)
-    private readonly financeCustomerModel: typeof FinanceCustomerModel,
-  ) {
-    super(financeCustomerModel);
-  }
-
-  create(
-    data: IFinanceCustomerAttr | any,
-    options?: any,
-  ): Promise<FinanceCustomerModel> | any {
-    return this.financeCustomerModel.create(data, options);
-  }
-
-  findOne(options: any): Promise<FinanceCustomerModel> {
-    return this.financeCustomerModel.findOne(options);
+  constructor() {
+    super(FinanceCustomerModel);
   }
 }

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

@@ -21,8 +21,7 @@ import { PaymentItemRepository } from '../payment-item/payment-item.repository';
 import Payment from '../payment/payment';
 import { DocumentRepository } from '../document/document.repository';
 import { DocumentItemRepository } from '../document/document-item.repository';
-
-const { getConfig } = require('../config');
+import { getConfig } from '../config';
 const config = getConfig();
 
 export default class FinanceCompany extends ObjectBase {
@@ -86,7 +85,7 @@ export default class FinanceCompany extends ObjectBase {
     return 'finance_Company';
   }
 
-  private constructor(
+  constructor(
     compSystemCode: string,
     compSystemRefId: string,
     accSystemCode: string,

package/src/models/account.entity.ts

@@ -11,9 +11,9 @@ import {
   HasMany,
 } from 'sequelize-typescript';
 import LedgerTransactionModel from './ledger-transaction.entity';
-import PaymentModel from './payment.entity';
 import DocumentItemModel from './document-item.entity';
 import FinanceCompanyModel from './finance-company.entity';
+import PaymentMethodTypeModel from './payment-method-type.entity';
 
 @Table({ tableName: 'finance_Account', createdAt: false, updatedAt: false })
 export default class AccountModel extends Model {
@@ -192,8 +192,8 @@ export default class AccountModel extends Model {
   })
   PostedDateTime: Date;
 
-  @HasMany(() => PaymentModel)
-  Payments: PaymentModel[];
+  @HasMany(() => PaymentMethodTypeModel)
+  PaymentMethodTypes: PaymentMethodTypeModel[];
 
   @HasMany(() => DocumentItemModel)
   DocumentItems: DocumentItemModel[];

package/src/payment/payment.ts

@@ -5,7 +5,7 @@ import { AccountSystemEntity } from '../account-system-entity/account-system-ent
 import { PaymentStatus } from '../enum/payment-status.enum';
 import { PaymentRepository } from './payment.repository';
 import { PaymentItemRepository } from '../payment-item/payment-item.repository';
-import PaymentItemModel from '../models/payment-item.entity';
+// import PaymentItemModel from '../models/payment-item.entity';
 import PaymentItem from '../payment-item/payment-item';
 
 export default class Payment extends AccountSystemEntity {