@tomei/finance 0.0.15 → 0.0.17

package/package.json

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

package/src/account/account.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/sequelize';
-import { BaseRepository } from '../base/base.repository.abstract';
+import { BaseRepository } from 'src/base/repository/base.repository.abstract';
 import { AccountModel } from './entities/account.entity';
 import {
   IAccountAttr,

package/src/account/account.ts

@@ -1,23 +1,19 @@
-import { ObjectBase } from 'src/base/object.base.abstract';
-import { PersonBase } from 'src/base/person.base.abstract';
-import {
-  IAccountOptions,
-  ICreateAccountAttr,
-} from './interfaces/account-attr.interface';
+import { ObjectBase, OwnerBase } from 'src/base';
+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;
 
-  Owner: PersonBase;
+  parentAccountNo: string;
+  Owner: OwnerBase;
   RelatedObject: ObjectBase;
 
   isParamsInitialized: boolean;
@@ -27,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);
     }
   }
 
@@ -70,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.',
@@ -94,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

@@ -102,9 +102,7 @@ export class AccountModel extends Model {
   UpdatedById: string;
 
   @BeforeValidate
-  static register(instance: any) {
-    instance.CreatedAt = new Date();
-    instance.UpdatedAt = new Date();
-    console.log(instance);
+  static beforeValidateProcess(instance: any) {
+    console.log(instance, '<<<<<<<');
   }
 }

package/src/account/index.ts

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

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

@@ -1,6 +1,4 @@
-import { ObjectBase } from 'src/base/object.base.abstract';
-import { PersonBase } from 'src/base/person.base.abstract';
-import { Account } from '../account';
+import { ObjectBase, OwnerBase } from 'src/base';
 
 export interface IAccountAttr {
   AccountNo: string;
@@ -17,13 +15,8 @@ export interface IAccountAttr {
 }
 
 export interface ICreateAccountAttr {
-  Owner: PersonBase;
+  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/base.repository.interface';
+import { IBaseRepository } from 'src/base/repository/base.repository.interface';
 import { AccountModel } from '../entities/account.entity';
 
 export type IAccountRepository = IBaseRepository<AccountModel>;

package/src/base/index.ts

@@ -1,7 +1,7 @@
-// import all classes from this folder and export them
 import { IAccountSystem } from './account-system.interface';
-import { AddressBase } from './address.base.abstract';
-import { ObjectBase } from './object.base.abstract';
-import { PersonBase } from './person.base.abstract';
+import { IOwner } from './owner/owner.interface';
+import { OwnerBase } from './owner/base.owner.abstract';
+import { IObject } from './object/object.interface';
+import { ObjectBase } from './object/base.object.abstract';
 
-export { IAccountSystem, AddressBase, ObjectBase, PersonBase };
+export { IAccountSystem, ObjectBase, OwnerBase, IObject, IOwner };

package/src/base/object/base.object.abstract.ts

@@ -0,0 +1,6 @@
+import { IObject } from './object.interface';
+
+export abstract class ObjectBase implements IObject {
+  abstract Id: string;
+  abstract Type: string;
+}

package/src/base/object/object.interface.ts

@@ -0,0 +1,4 @@
+export interface IObject {
+  Id: string;
+  Type: string;
+}

package/src/base/owner/base.owner.abstract.ts

@@ -0,0 +1,21 @@
+import { ObjectBase } from '../object/base.object.abstract';
+import { IOwner } from './owner.interface';
+
+export abstract class OwnerBase extends ObjectBase implements IOwner {
+  abstract FullName: string;
+  abstract IDNo: string;
+  abstract IDType: string;
+  abstract Email: string;
+  abstract ContactNo: string;
+  abstract Address: string;
+  abstract getDetails(): {
+    FullName: string;
+    IDNo: string;
+    IDType: string;
+    Email: string;
+    ContactNo: string;
+    Address: string;
+    Id: string;
+    Type: string;
+  };
+}

package/src/base/owner/owner.interface.ts

@@ -0,0 +1,20 @@
+import { IObject } from '../object/object.interface';
+
+export interface IOwner extends IObject {
+  FullName: string;
+  IDNo: string;
+  IDType: string;
+  Email: string;
+  ContactNo: string;
+  Address: string;
+  getDetails(): {
+    FullName: string;
+    IDNo: string;
+    IDType: string;
+    Email: string;
+    ContactNo: string;
+    Address: string;
+    Id: string;
+    Type: string;
+  };
+}

package/src/quickbook-client/client.ts

@@ -67,7 +67,15 @@ export class QuickBookClient {
     return this.quickBookClient;
   }
 
-  public get token(): string {
+  public get token(): {
+    token_type: string;
+    access_token: string;
+    refresh_token: string;
+    expires_in: number;
+    x_refresh_token_expires_in: number;
+    id_token: string;
+    createdAt: number;
+  } {
     return this.quickBookClient.token.getToken();
   }
 

package/src/base/address.base.abstract.ts

@@ -1,7 +0,0 @@
-export abstract class AddressBase {
-  address: string;
-
-  constructor(address: string) {
-    this.address = address;
-  }
-}

package/src/base/object.base.abstract.ts

@@ -1,8 +0,0 @@
-export abstract class ObjectBase {
-  Id: string;
-  Name: string;
-  constructor(id: string, name: string) {
-    this.Id = id;
-    this.Name = name;
-  }
-}

package/src/base/person.base.abstract.ts

@@ -1,44 +0,0 @@
-import { AddressBase } from './address.base.abstract';
-import { ObjectBase } from './object.base.abstract';
-
-export abstract class PersonBase extends ObjectBase {
-  Fullname: string;
-  IDNo: string;
-  IDType: string;
-  Email: string;
-  ContactNo: string;
-  Address: AddressBase;
-
-  constructor(
-    id: string,
-    name: string,
-    fullname: string,
-    idNo: string,
-    idType: string,
-    email: string,
-    contactNo: string,
-    address: AddressBase,
-  ) {
-    super(id, name);
-    this.Fullname = fullname;
-    this.IDNo = idNo;
-    this.IDType = idType;
-    this.Email = email;
-    this.ContactNo = contactNo;
-    this.Address = address;
-  }
-
-  abstract getDetails():
-    | {
-        Id: string;
-        Name: string;
-        Fullname: string;
-        IDNo: string;
-        IDType: string;
-        Email: string;
-        ContactNo: string;
-        Address: AddressBase;
-      }
-    | null
-    | undefined;
-}