@tomei/finance 0.0.16 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/finance",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "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 { BaseRepository } from 'src/base/repository/base.repository.abstract';
-// import { AccountModel } from './entities/account.entity';
-// import {
-//   IAccountAttr,
-//   ICreateAccountAttr,
-// } from './interfaces/account-attr.interface';
-// import { IAccountRepository } from './interfaces/account.repository.interface';
+import { Injectable } from '@nestjs/common';
+import { InjectModel } from '@nestjs/sequelize';
+import { BaseRepository } from 'src/base/base.repository.abstract'; 
+import { AccountModel } from './entities/account.entity';
+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);
-//   }
+@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);
-//   }
+  create(data: ICreateAccountAttr, options?: any): Promise<AccountModel> | any {
+    return this.accountModel.create({ ...data }, options);
+  }
 
-//   findAll(options: any): Promise<AccountModel[]> {
-//     return this.accountModel.findAll(options);
-//   }
+  findAll(options: any): Promise<AccountModel[]> {
+    return this.accountModel.findAll(options);
+  }
 
-//   findAllWithPagination(
-//     options: any,
-//   ): Promise<{ count: number; rows: AccountModel[] }> {
-//     return this.accountModel.findAndCountAll(options);
-//   }
+  findAllWithPagination(
+    options: any,
+  ): Promise<{ count: number; rows: AccountModel[] }> {
+    return this.accountModel.findAndCountAll(options);
+  }
 
-//   findOne(options: any): Promise<AccountModel> {
-//     return this.accountModel.findOne(options);
-//   }
+  findOne(options: any): Promise<AccountModel> {
+    return this.accountModel.findOne(options);
+  }
 
-//   update(data: IAccountAttr, options?: any): any {
-//     return this.accountModel.update({ ...data }, options);
-//   }
-// }
+  update(data: IAccountAttr, options?: any): any {
+    return this.accountModel.update({ ...data }, options);
+  }
+}

package/src/account/account.ts

@@ -1,21 +1,18 @@
 import { ObjectBase, OwnerBase } from 'src/base';
-import {
-  IAccountOptions,
-  ICreateAccountAttr,
-} from './interfaces/account-attr.interface';
+import { ICreateAccountAttr } from './interfaces/account-attr.interface';
 import { IAccountRepository } from './interfaces/account.repository.interface';
-import * as OAuthClient from 'intuit-oauth';
+import { QuickBookClient } from 'src/quickbook-client';
 export class Account {
   accountRepository: IAccountRepository;
   intuitClient: any;
 
-  OwnerId: string;
-  OwnerType: string;
-  RelatedObjectId: string;
-  RelatedObjectType: string;
-  AccSystemId: string;
-  parentAccount: Account;
+  private OwnerId: string;
+  private OwnerType: string;
+  private RelatedObjectId: string;
+  private RelatedObjectType: string;
+  private AccSystemId: string;
 
+  parentAccountNo: string;
   Owner: OwnerBase;
   RelatedObject: ObjectBase;
 
@@ -26,18 +23,12 @@ export class Account {
   constructor(
     accountRepository: IAccountRepository,
     SysCode: string,
-    options?: IAccountOptions,
+    params?: ICreateAccountAttr,
   ) {
     this.accountRepository = accountRepository;
     this.AccSystemId = SysCode;
-    if (options) {
-      if (options.params) {
-        this.init(options.params);
-      }
-
-      if (options.account) {
-        this.parentAccount = options.account;
-      }
+    if (params) {
+      this.init(params);
     }
   }
 
@@ -69,13 +60,16 @@ export class Account {
     }
 
     this.OwnerId = params.Owner.Id;
-    this.OwnerType = 'Owner';
+    this.OwnerType = typeof this.Owner;
     this.RelatedObjectId = params.RelatedObject.Id;
-    this.RelatedObjectType = 'RelatedObject';
+    this.RelatedObjectType = typeof this.RelatedObject;
+    if (params.ParentAccountNo) {
+      this.parentAccountNo = params.ParentAccountNo;
+    }
     this.isParamsInitialized = true;
   }
 
-  async create(client: OAuthClient, dbOptions: any) {
+  async create(client: QuickBookClient, dbOptions: any) {
     if (!this.Owner || !this.RelatedObject) {
       throw new Error(
         'Owner must be set before creating an account." or "RelatedObject must be set before creating an account.',
@@ -93,6 +87,7 @@ export class Account {
         Owner: this.Owner,
         RelatedObject: this.RelatedObject,
         Client: client,
+        ParentAccountNo: this.parentAccountNo,
       },
       dbOptions,
     );

package/src/account/entities/account.entity.ts

@@ -8,7 +8,6 @@ import {
   UpdatedAt,
   BeforeValidate,
 } from 'sequelize-typescript';
-import { IObject, IOwner } from 'src/base';
 
 @Table({ tableName: 'finance_Account', createdAt: false, updatedAt: false })
 export class AccountModel extends Model {
@@ -104,15 +103,6 @@ export class AccountModel extends Model {
 
   @BeforeValidate
   static beforeValidateProcess(instance: any) {
-    console.log(instance.client, '<<<<<<<');
-  }
-
-  Owner: IOwner;
-  RelatedObject: IObject;
-
-  constructor(Owner: IOwner, RelatedObject: IObject) {
-    super();
-    this.Owner = Owner;
-    this.RelatedObject = RelatedObject;
+    console.log(instance, '<<<<<<<');
   }
 }

package/src/account/index.ts

@@ -1,8 +1,7 @@
 import { AccountModel } from './entities/account.entity';
 import { Account } from './account';
-// import { AccountRepository } from './account.repository';
+import { AccountRepository } from './account.repository';
 import {
-  IAccountOptions,
   IAccountAttr,
   ICreateAccountAttr,
 } from './interfaces/account-attr.interface';
@@ -11,8 +10,7 @@ import { IAccountRepository } from './interfaces/account.repository.interface';
 export {
   AccountModel,
   Account,
-  // AccountRepository,
-  IAccountOptions,
+  AccountRepository,
   IAccountAttr,
   ICreateAccountAttr,
   IAccountRepository,

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

@@ -1,5 +1,4 @@
 import { ObjectBase, OwnerBase } from 'src/base';
-import { Account } from '../account';
 
 export interface IAccountAttr {
   AccountNo: string;
@@ -18,11 +17,6 @@ export interface IAccountAttr {
 export interface ICreateAccountAttr {
   Owner: OwnerBase;
   RelatedObject: ObjectBase;
-  AccSystemId: string;
   Client?: any;
-}
-
-export interface IAccountOptions {
-  params?: ICreateAccountAttr;
-  account?: Account;
+  ParentAccountNo?: string;
 }

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

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