@tomei/finance 0.2.2 → 0.2.4

package/migrations/finance-customer-migration.js

@@ -1,33 +1,33 @@
-'use strict';
-
-module.exports = {
-  async up(queryInterface, Sequelize) {
-    await queryInterface.createTable('finance_Customer', {
-      CustomerId: {
-        type: Sequelize.STRING(30),
-        primaryKey: true,
-        allowNull: false,
-      },
-      SystemCode: {
-        type: Sequelize.STRING(30),
-        allowNull: false,
-      },
-      AccSystemCode: {
-        type: Sequelize.STRING(30),
-        allowNull: false,
-      },
-      AccSystemCustomerId: {
-        type: Sequelize.STRING(30),
-        allowNull: false,
-      },
-      CustomerRefId: {
-        type: Sequelize.STRING(30),
-        allowNull: false,
-      },
-    });
-  },
-
-  async down(queryInterface) {
-    await queryInterface.dropTable('finance_Customer');
-  },
-};
+'use strict';
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable('finance_Customer', {
+      CustomerId: {
+        type: Sequelize.STRING(30),
+        primaryKey: true,
+        allowNull: false,
+      },
+      SystemCode: {
+        type: Sequelize.STRING(30),
+        allowNull: false,
+      },
+      AccSystemCode: {
+        type: Sequelize.STRING(30),
+        allowNull: false,
+      },
+      AccSystemCustomerId: {
+        type: Sequelize.STRING(30),
+        allowNull: false,
+      },
+      CustomerRefId: {
+        type: Sequelize.STRING(30),
+        allowNull: false,
+      },
+    });
+  },
+
+  async down(queryInterface) {
+    await queryInterface.dropTable('finance_Customer');
+  },
+};

package/migrations/finance-payment-migration.js

@@ -1,89 +1,89 @@
-'use strict';
-
-module.exports = {
-  async up(queryInterface, Sequelize) {
-    await queryInterface.createTable('finance_Payment', {
-      PaymentId: {
-        type: Sequelize.STRING(30),
-        primaryKey: true,
-        allowNull: false,
-      },
-      AccountNo: {
-        type: Sequelize.STRING(30),
-        allowNull: false,
-        references: {
-          model: 'finance_Account',
-          key: 'AccountNo',
-        },
-        onUpdate: 'CASCADE',
-        onDelete: 'CASCADE',
-      },
-      PaymentType: {
-        type: Sequelize.ENUM(['Payment Received', 'Payout']),
-        defaultValue: 'Payment Received',
-        allowNull: false,
-      },
-      PaymentDate: {
-        type: Sequelize.DATE,
-        allowNull: false,
-      },
-      Currency: {
-        type: Sequelize.CHAR(3),
-        allowNull: false,
-      },
-      Amount: {
-        type: Sequelize.DECIMAL(10, 2),
-        allowNull: false,
-      },
-      Status: {
-        type: Sequelize.STRING(20),
-        allowNull: false,
-      },
-      Method: {
-        type: Sequelize.STRING,
-        allowNull: false,
-      },
-      MethodParty: {
-        type: Sequelize.STRING(255),
-        allowNull: false,
-      },
-      MethodAccountName: {
-        type: Sequelize.STRING(100),
-        allowNull: true,
-      },
-      MethodAccountNo: {
-        type: Sequelize.STRING(100),
-        allowNull: true,
-      },
-      TransactionId: {
-        type: Sequelize.STRING(100),
-        allowNull: true,
-      },
-      ApprovalId: {
-        type: Sequelize.STRING(100),
-        allowNull: true,
-      },
-      ReceivedBy: {
-        type: Sequelize.STRING(30),
-        allowNull: false,
-      },
-      UpdatedAt: {
-        allowNull: false,
-        defaultValue: new Date(),
-        type: Sequelize.DATE,
-      },
-      UpdatedBy: {
-        allowNull: false,
-        type: Sequelize.STRING,
-      },
-      Remarks: {
-        type: Sequelize.TEXT,
-        allowNull: true,
-      },
-    });
-  },
-
-  async down(queryInterface) {
-    await queryInterface.dropTable('finance_Payment');
-  },
-};
+'use strict';
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable('finance_Payment', {
+      PaymentId: {
+        type: Sequelize.STRING(30),
+        primaryKey: true,
+        allowNull: false,
+      },
+      AccountNo: {
+        type: Sequelize.STRING(30),
+        allowNull: false,
+        references: {
+          model: 'finance_Account',
+          key: 'AccountNo',
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE',
+      },
+      PaymentType: {
+        type: Sequelize.ENUM(['Payment Received', 'Payout']),
+        defaultValue: 'Payment Received',
+        allowNull: false,
+      },
+      PaymentDate: {
+        type: Sequelize.DATE,
+        allowNull: false,
+      },
+      Currency: {
+        type: Sequelize.CHAR(3),
+        allowNull: false,
+      },
+      Amount: {
+        type: Sequelize.DECIMAL(10, 2),
+        allowNull: false,
+      },
+      Status: {
+        type: Sequelize.STRING(20),
+        allowNull: false,
+      },
+      Method: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      MethodParty: {
+        type: Sequelize.STRING(255),
+        allowNull: false,
+      },
+      MethodAccountName: {
+        type: Sequelize.STRING(100),
+        allowNull: true,
+      },
+      MethodAccountNo: {
+        type: Sequelize.STRING(100),
+        allowNull: true,
+      },
+      TransactionId: {
+        type: Sequelize.STRING(100),
+        allowNull: true,
+      },
+      ApprovalId: {
+        type: Sequelize.STRING(100),
+        allowNull: true,
+      },
+      ReceivedBy: {
+        type: Sequelize.STRING(30),
+        allowNull: false,
+      },
+      UpdatedAt: {
+        allowNull: false,
+        defaultValue: new Date(),
+        type: Sequelize.DATE,
+      },
+      UpdatedBy: {
+        allowNull: false,
+        type: Sequelize.STRING,
+      },
+      Remarks: {
+        type: Sequelize.TEXT,
+        allowNull: true,
+      },
+    });
+  },
+
+  async down(queryInterface) {
+    await queryInterface.dropTable('finance_Payment');
+  },
+};

package/package.json

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

package/src/account/account.repository.ts

@@ -1,44 +1,44 @@
-import { Injectable } from '@nestjs/common';
-import { InjectModel } from '@nestjs/sequelize';
-import { AccountModel } from './entities/account.entity';
-import { BaseRepository } from '@tomei/general';
-import {
-  IAccountAttr,
-  ICreateAccountAttr,
-} from './interfaces/account-attr.interface';
-import { IAccountRepository } from './interfaces/account.repository.interface';
-
-@Injectable()
-export class AccountRepository
-  extends BaseRepository<AccountModel>
-  implements IAccountRepository
-{
-  constructor(
-    @InjectModel(AccountModel)
-    private readonly accountModel: typeof AccountModel,
-  ) {
-    super(accountModel);
-  }
-
-  create(data: ICreateAccountAttr, options?: any): Promise<AccountModel> | any {
-    return this.accountModel.create({ ...data }, options);
-  }
-
-  findAll(options: any): Promise<AccountModel[]> {
-    return this.accountModel.findAll(options);
-  }
-
-  findAllWithPagination(
-    options: any,
-  ): Promise<{ count: number; rows: AccountModel[] }> {
-    return this.accountModel.findAndCountAll(options);
-  }
-
-  findOne(options: any): Promise<AccountModel> {
-    return this.accountModel.findOne(options);
-  }
-
-  update(data: IAccountAttr, options?: any): any {
-    return this.accountModel.update({ ...data }, options);
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectModel } from '@nestjs/sequelize';
+import { AccountModel } from './entities/account.entity';
+import { BaseRepository } from '@tomei/general';
+import {
+  IAccountAttr,
+  ICreateAccountAttr,
+} from './interfaces/account-attr.interface';
+import { IAccountRepository } from './interfaces/account.repository.interface';
+
+@Injectable()
+export class AccountRepository
+  extends BaseRepository<AccountModel>
+  implements IAccountRepository
+{
+  constructor(
+    @InjectModel(AccountModel)
+    private readonly accountModel: typeof AccountModel,
+  ) {
+    super(accountModel);
+  }
+
+  create(data: ICreateAccountAttr, options?: any): Promise<AccountModel> | any {
+    return this.accountModel.create({ ...data }, options);
+  }
+
+  findAll(options: any): Promise<AccountModel[]> {
+    return this.accountModel.findAll(options);
+  }
+
+  findAllWithPagination(
+    options: any,
+  ): Promise<{ count: number; rows: AccountModel[] }> {
+    return this.accountModel.findAndCountAll(options);
+  }
+
+  findOne(options: any): Promise<AccountModel> {
+    return this.accountModel.findOne(options);
+  }
+
+  update(data: IAccountAttr, options?: any): any {
+    return this.accountModel.update({ ...data }, options);
+  }
+}

package/src/account/account.ts

@@ -22,33 +22,38 @@ export class Account {
   private AccountType: string;
   private AccountSubtype: string;
 
+  constructor();
   constructor(
-    accountRepository: IBaseRepository<AccountModel>,
-    accountNo: string,
+    accountRepository?: IBaseRepository<AccountModel>,
+    accountNo?: string,
   ) {
-    this.accountRepository = accountRepository;
-    this.AccountNo = accountNo;
-    const accountData = this.accountRepository.findOne({
-      where: { AccountNo: accountNo },
-    });
-    if (accountData) {
-      this.isNewRecord = false;
-      this.ParentAccountNo = accountData.ParentAccountNo;
-      this.SystemCode = accountData.SystemCode;
-      this.AccSystemCode = accountData.AccSystemCode;
-      this.AccSystemAccountId = accountData.AccSystemAccountId;
-      this.Name = accountData.Name;
-      this.Description = accountData.Description;
-      this.AccountType = accountData.AccountType;
-      this.AccountSubtype = accountData.AccountSubtype;
-      this.OwnerId = accountData.OwnerId;
-      this.OwnerType = accountData.OwnerType;
-      this.RelatedObjectId = accountData.RelatedObjectId;
-      this.RelatedObjectType = accountData.RelatedObjectType;
-      this.AccSystemCode = accountData.AccSystemCode;
-    } else {
-      const notFoundError = new RecordNotFoundError('No Record Found.');
-      throw notFoundError;
+    if (accountRepository && accountNo) {
+      this.accountRepository = accountRepository;
+      this.AccountNo = accountNo;
+      const accountData = this.accountRepository.findOne({
+        where: { AccountNo: accountNo },
+      });
+      if (accountData) {
+        this.isNewRecord = false;
+        this.ParentAccountNo = accountData.ParentAccountNo;
+        this.SystemCode = accountData.SystemCode;
+        this.AccSystemCode = accountData.AccSystemCode;
+        this.AccSystemAccountId = accountData.AccSystemAccountId;
+        this.Name = accountData.Name;
+        this.Description = accountData.Description;
+        this.AccountType = accountData.AccountType;
+        this.AccountSubtype = accountData.AccountSubtype;
+        this.OwnerId = accountData.OwnerId;
+        this.OwnerType = accountData.OwnerType;
+        this.RelatedObjectId = accountData.RelatedObjectId;
+        this.RelatedObjectType = accountData.RelatedObjectType;
+        this.AccSystemCode = accountData.AccSystemCode;
+      } else {
+        const notFoundError = new RecordNotFoundError('No Record Found.');
+        throw notFoundError;
+      }
+    } else if (accountRepository || accountNo) {
+      throw new Error('AccountNo and AccountRepository both are required.');
     }
   }
 

package/src/account/interfaces/account.repository.interface.ts

@@ -1,4 +1,4 @@
-import { IBaseRepository } from '@tomei/general';
-import { AccountModel } from '../entities/account.entity';
-
-export type IAccountRepository = IBaseRepository<AccountModel>;
+import { IBaseRepository } from '@tomei/general';
+import { AccountModel } from '../entities/account.entity';
+
+export type IAccountRepository = IBaseRepository<AccountModel>;