@tomei/finance 0.3.0 → 0.3.1

package/src/models/account.entity.ts

@@ -1,5 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import {
+  ForeignKey,
+  BelongsTo,
   Column,
   CreatedAt,
   Model,
@@ -11,6 +13,7 @@ import {
 import LedgerTransactionModel from './ledger-transaction.entity';
 import PaymentModel from './payment.entity';
 import DocumentItemModel from './document-item.entity';
+import FinanceCompanyModel from './finance-company.entity';
 
 @Table({ tableName: 'finance_Account', createdAt: false, updatedAt: false })
 export default class AccountModel extends Model {
@@ -22,48 +25,31 @@ export default class AccountModel extends Model {
   })
   AccountNo: string;
 
-  @ApiProperty({ type: String, description: 'Parent account of this object' })
-  @Column({
-    type: DataType.STRING(30),
-  })
-  ParentAccountNo: string;
-
-  @ApiProperty({
-    type: String,
-    description: 'System Code eg. "EZC", "CRM"',
-  })
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(10),
-  })
-  SystemCode: string;
-
   @ApiProperty({
-    type: String,
-    description: 'Finance account system code eg. "quickbook"',
+    example: 'cl6nzvo780000qcw38ihpd8w6',
+    description: 'CompanyId',
   })
+  @ForeignKey(() => FinanceCompanyModel)
   @Column({
     allowNull: false,
-    type: DataType.STRING(10),
+    type: DataType.STRING(30),
   })
-  AccSystemCode: string;
+  CompanyId: string;
 
-  @ApiProperty({
-    type: String,
-    description: 'Account id in finance system',
-  })
+  //copy from finance account migration table
+  @ApiProperty({ type: String, description: 'Parent account of this object' })
   @Column({
-    allowNull: false,
-    type: DataType.STRING(10),
+    type: DataType.STRING(30),
+    allowNull: true,
   })
-  AccSystemRefId: string;
+  ParentAccountNo: string;
 
   @ApiProperty({
     type: String,
     description: 'Name of the account',
   })
   @Column({
-    allowNull: true,
+    allowNull: false,
     type: DataType.STRING(200),
   })
   Name: string;
@@ -74,7 +60,7 @@ export default class AccountModel extends Model {
   })
   @Column({
     allowNull: true,
-    type: DataType.TEXT,
+    type: DataType.STRING(2000),
   })
   Description: string;
 
@@ -83,7 +69,7 @@ export default class AccountModel extends Model {
     description: 'Account Type',
   })
   @Column({
-    allowNull: true,
+    allowNull: false,
     type: DataType.STRING(100),
   })
   AccountType: string;
@@ -143,7 +129,10 @@ export default class AccountModel extends Model {
     example: '138140891dd211b288d34bc7b4312a49',
     description: 'The CreatedById for Media.',
   })
-  @Column({ allowNull: false, type: DataType.STRING(30) })
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
   CreatedById: string;
 
   @ApiProperty({
@@ -157,9 +146,52 @@ export default class AccountModel extends Model {
     example: '138140891dd211b288d34bc7b4312a49',
     description: 'The UpdatedById for Media.',
   })
-  @Column({ allowNull: false, type: DataType.STRING(30) })
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
   UpdatedById: string;
 
+  @ApiProperty({
+    type: String,
+    description: 'Account id in finance system',
+  })
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(10),
+  })
+  AccSystemRefId: string;
+
+  @ApiProperty({
+    example: 'N',
+    description: 'PostedToAccSystemYN',
+  })
+  @Column({
+    allowNull: false,
+    type: DataType.ENUM('Y', 'N'),
+  })
+  PostedToAccSystemYN: string;
+
+  @ApiProperty({
+    example: '138140891dd211b288',
+    description: 'PostedById',
+  })
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
+  PostedById: string;
+
+  @ApiProperty({
+    example: new Date(),
+    description: 'PostedToAccSystem Date',
+  })
+  @Column({
+    allowNull: true,
+    type: DataType.DATE,
+  })
+  PostedDateTime: Date;
+
   @HasMany(() => PaymentModel)
   Payments: PaymentModel[];
 
@@ -168,4 +200,7 @@ export default class AccountModel extends Model {
 
   @HasMany(() => LedgerTransactionModel)
   LedgerTransactions: LedgerTransactionModel[];
+
+  @BelongsTo(() => FinanceCompanyModel)
+  FinanceCompany: FinanceCompanyModel;
 }

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

@@ -20,22 +20,6 @@ export default class FinanceCompanyModel extends Model {
   @Column({ allowNull: false, type: DataType.STRING(10) })
   AccSystemCode: string;
 
-  @ApiProperty({ example: 'cl6nzvo780000qcw38ihpd8w6' })
-  @Column({ allowNull: false, type: DataType.STRING(30) })
-  AccSystemRefId: string;
-
-  @ApiProperty({ example: 'N' })
-  @Column({ defaultValue: 'N', type: DataType.ENUM('Y', 'N') })
-  PostedToAccSystemYN: string;
-
-  @ApiProperty({ example: 'cl6nzvo780000qcw38ihpd8w6' })
-  @Column({ type: DataType.STRING(30) })
-  PostedById: string;
-
-  @ApiProperty({ example: new Date() })
-  @Column({ type: DataType.DATE })
-  PostedDateTime: Date;
-
   @HasMany(() => FinanceCustomerModel)
   FinanceCustomers: FinanceCustomerModel[];
 }

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

@@ -42,6 +42,12 @@ export default class PaymentItemModel extends Model {
   })
   Amount: number;
 
+  @Column({
+    type: DataType.STRING(30),
+    allowNull: true,
+  })
+  TaxCode: string;
+
   @BelongsTo(() => PaymentModel)
   Payment: PaymentModel;
 }

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

@@ -0,0 +1,70 @@
+import { ApiProperty } from '@nestjs/swagger';
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  Model,
+  Table,
+  ForeignKey,
+} from 'sequelize-typescript';
+import AccountModel from './account.entity';
+import PaymentMethodModel from './payment-method.entity';
+
+@Table({
+  tableName: 'finance_PaymentMethodType',
+  createdAt: false,
+  updatedAt: false,
+})
+export default class PaymentMethodTypeModel extends Model {
+  @ForeignKey(() => PaymentMethodModel)
+  @ApiProperty({ example: 'cl6nzvo780000qcw38ihpd8w6' })
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  MethodId: string;
+
+  @ApiProperty({ example: 'cl6nzvo780000qcw38ihpd8w6' })
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  MethodTypeId: string;
+
+  @ApiProperty({ example: 'Cash' })
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(100),
+  })
+  Name: string;
+
+  @ForeignKey(() => AccountModel)
+  @ApiProperty({ example: 'cl6nzvo780000qcw38ihpd8w6' })
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  AccountNo: string;
+
+  @ApiProperty({ example: '100.0' })
+  @Column({
+    allowNull: false,
+    type: DataType.DECIMAL(10, 2),
+  })
+  ProcessingFeeRate: number;
+
+  @ForeignKey(() => AccountModel)
+  @ApiProperty({ example: 'cl6nzvo780000qcw38ihpd8w6' })
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  ProcessingFeeAccountNo: string;
+
+  @BelongsTo(() => AccountModel)
+  Account: AccountModel;
+
+  @BelongsTo(() => PaymentMethodModel)
+  PaymentMethod: PaymentMethodModel;
+}

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

@@ -0,0 +1,28 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Column, DataType, HasMany, Model, Table } from 'sequelize-typescript';
+import PaymentMethodTypeModel from './payment-method-type.entity';
+
+@Table({
+  tableName: 'finance_PaymentMethod',
+  createdAt: false,
+  updatedAt: false,
+})
+export default class PaymentMethodModel extends Model {
+  @ApiProperty({ example: 'cl6nzvo780000qcw38ihpd8w6' })
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  MethodId: string;
+
+  @ApiProperty({ example: 'Cash' })
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(100),
+  })
+  Name: string;
+
+  @HasMany(() => PaymentMethodTypeModel)
+  PaymentMethodType: PaymentMethodTypeModel[];
+}

package/src/models/payment.entity.ts

@@ -1,3 +1,4 @@
+import { ApiProperty } from '@nestjs/swagger';
 import {
   BelongsTo,
   Column,
@@ -6,12 +7,19 @@ import {
   HasMany,
   Model,
   Table,
+  UpdatedAt,
 } from 'sequelize-typescript';
-import { PaymentType } from '../enum/payment-type.enum';
-import AccountModel from './account.entity';
+import { PaymentType, PaymentStatus } from '../enum';
+import FinanceCompanyModel from './finance-company.entity';
 import PaymentItemModel from './payment-item.entity';
-
-@Table({ tableName: 'finance_Payment', createdAt: false, updatedAt: false })
+import PaymentMethodTypeModel from './payment-method-type.entity';
+
+@Table({
+  tableName: 'finance_Payment',
+  timestamps: false,
+  createdAt: false,
+  updatedAt: false,
+})
 export default class PaymentModel extends Model {
   @Column({
     primaryKey: true,
@@ -20,16 +28,9 @@ export default class PaymentModel extends Model {
   })
   PaymentId: string;
 
-  @ForeignKey(() => AccountModel)
   @Column({
     allowNull: false,
-    type: DataType.STRING(30),
-  })
-  AccountNo: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
+    type: DataType.ENUM('Payment Received', 'Payout'),
   })
   PaymentType: PaymentType;
 
@@ -39,59 +40,69 @@ export default class PaymentModel extends Model {
   })
   PaymentDate: Date;
 
+  @ApiProperty({
+    example: 'cl6nzvo780000qcw38ihpd8w6',
+    description: 'CompanyId',
+  })
+  @ForeignKey(() => FinanceCompanyModel)
   @Column({
     allowNull: false,
-    type: DataType.CHAR(3),
+    type: DataType.STRING(30),
   })
-  Currency: string;
+  CompanyId: string;
 
+  @ApiProperty({
+    example: 'cl6nzvo780000qcw38ihpd8w6',
+    description: 'MethodTypeId',
+  })
+  @ForeignKey(() => PaymentMethodTypeModel)
   @Column({
     allowNull: false,
-    type: DataType.DECIMAL(10, 2),
+    type: DataType.STRING(30),
   })
-  Amount: number;
+  MethodTypeId: string;
 
   @Column({
     allowNull: false,
-    type: DataType.STRING(30),
+    type: DataType.CHAR(3),
   })
-  Status: string;
+  Currency: string;
 
   @Column({
     allowNull: false,
-    type: DataType.STRING,
+    type: DataType.DECIMAL(10, 2),
   })
-  Method: string;
+  Amount: number;
 
   @Column({
     allowNull: false,
-    type: DataType.STRING(255),
+    type: DataType.STRING(30),
   })
-  MethodParty: string;
+  Status: PaymentStatus;
 
   @Column({
     allowNull: true,
     type: DataType.STRING(100),
   })
-  MethodAccountName: string;
+  TransactionId: string;
 
   @Column({
     allowNull: true,
     type: DataType.STRING(100),
   })
-  MethodAccountNo: string;
+  TransactionApprovalCode: string;
 
   @Column({
     allowNull: true,
     type: DataType.STRING(100),
   })
-  TransactionId: string;
+  TransactionAccountName: string;
 
   @Column({
     allowNull: true,
     type: DataType.STRING(100),
   })
-  ApprovalId: string;
+  TransactionAccountNo: string;
 
   @Column({
     allowNull: false,
@@ -99,10 +110,11 @@ export default class PaymentModel extends Model {
   })
   ReceivedBy: string;
 
-  @Column({
-    allowNull: false,
-    type: DataType.DATE,
+  @ApiProperty({
+    example: new Date(),
+    description: 'Timestamp for latest data modification',
   })
+  @UpdatedAt
   UpdatedAt: Date;
 
   @Column({
@@ -117,9 +129,52 @@ export default class PaymentModel extends Model {
   })
   Remarks: string;
 
-  @BelongsTo(() => AccountModel)
-  Account: AccountModel;
+  @ApiProperty({
+    type: String,
+    description: 'Account Customer Id in API',
+  })
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
+  AccSystemRefId: string;
+
+  @ApiProperty({
+    example: 'N',
+    description: 'PostedToAccSystemYN',
+  })
+  @Column({
+    allowNull: false,
+    type: DataType.ENUM('Y', 'N'),
+  })
+  PostedToAccSystemYN: string;
+
+  @ApiProperty({
+    example: '138140891dd211b288',
+    description: 'PostedById',
+  })
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
+  PostedById: string;
+
+  @ApiProperty({
+    example: new Date(),
+    description: 'PostedToAccSystem Date',
+  })
+  @Column({
+    allowNull: true,
+    type: DataType.DATE,
+  })
+  PostedDateTime: Date;
 
   @HasMany(() => PaymentItemModel)
   PaymentItems: PaymentItemModel[];
+
+  @BelongsTo(() => FinanceCompanyModel)
+  FinanceCompany: FinanceCompanyModel;
+
+  @BelongsTo(() => PaymentMethodTypeModel)
+  PaymentMethodType: PaymentMethodTypeModel;
 }

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

@@ -1,21 +1,24 @@
-import { PaymentType } from '../../enum';
+import { PaymentType, PaymentStatus } from '../../enum';
 
 export class IPaymentAttr {
   PaymentId: string;
-  AccountNo: string;
   PaymentType: PaymentType;
   PaymentDate: Date;
+  CompanyId: string;
+  MethodTypeId: string;
   Currency: string;
   Amount: number;
-  Status: string;
-  Method: string;
-  MethodParty: string;
-  MethodAccountName?: string;
-  MethodAccountNo?: string;
+  Status: PaymentStatus;
   TransactionId?: string;
-  ApprovalId?: string;
+  TransactionApprovalCode?: string;
+  TransactionAccountName?: string;
+  TransactionAccountNo?: string;
   ReceivedBy: string;
   UpdatedAt: Date;
   UpdatedBy: string;
   Remarks?: string;
+  AccSystemRefId?: string;
+  PostedToAccSystemYN: string;
+  PostedById?: string;
+  PostedDateTime?: Date;
 }

package/src/payment/payment.repository.ts

@@ -1,41 +1,11 @@
-import { Injectable } from '@nestjs/common';
-import { InjectModel } from '@nestjs/sequelize';
-import { BaseRepository } from '@tomei/general';
+import { RepositoryBase, IRepositoryBase } from '@tomei/general';
 import PaymentModel from '../models/payment.entity';
-import { IPaymentAttr } from './interfaces/payment-attr.interface';
-import { IPaymentRepository } from './interfaces/payment.repository.interface';
 
-@Injectable()
 export class PaymentRepository
-  extends BaseRepository<PaymentModel>
-  implements IPaymentRepository
+  extends RepositoryBase<PaymentModel>
+  implements IRepositoryBase<PaymentModel>
 {
-  constructor(
-    @InjectModel(PaymentModel)
-    private readonly paymentModel: typeof PaymentModel,
-  ) {
-    super(paymentModel);
-  }
-
-  create(data: IPaymentAttr, options?: any): Promise<PaymentModel> | any {
-    return this.paymentModel.create({ ...data }, options);
-  }
-
-  findAll(options: any): Promise<PaymentModel[]> {
-    return this.paymentModel.findAll(options);
-  }
-
-  findAllWithPagination(
-    options: any,
-  ): Promise<{ count: number; rows: PaymentModel[] }> {
-    return this.paymentModel.findAndCountAll(options);
-  }
-
-  findOne(options: any): Promise<PaymentModel> {
-    return this.paymentModel.findOne(options);
-  }
-
-  update(data: IPaymentAttr, options?: any): any {
-    return this.paymentModel.update({ ...data }, options);
+  constructor() {
+    super(PaymentModel);
   }
 }