@tomei/finance 0.2.13 → 0.2.14

package/src/journal-entry/journal-entry.ts

@@ -1,36 +1,68 @@
+import * as cuid from 'cuid';
+import { Op } from 'sequelize';
 import { LedgerTransactionRepository } from '../ledger-transaction/ledger-transaction.repository';
 import { LedgerTransaction } from '../ledger-transaction';
 import { ILedgerTransactionTypeOptionsAttr } from '../ledger-transaction/interfaces/ledger-transaction-attr.interface';
 import { JournalEntryRepository } from './journal-entry.repository';
 import { IJournalEntryAttr } from './interfaces/journal-entry-attr.interface';
 import { TransactionTypeOptions } from '../enum';
-import { Op } from 'sequelize';
 import { JournalEntryModel } from './entities/journal-entry.entity';
 import { AccountSystemEntity } from '../account-system-entity';
+import { IBaseRepository } from '@tomei/general';
 
 export class JournalEntry extends AccountSystemEntity {
-  TableName: string;
-  protected BaseRepository;
-  ObjectId: string;
-  ObjectName: string;
-  JournalEntryId: string;
+  private _JournalEntryId: string;
   Date: Date;
   Name: string;
   Description: string;
-  DatePosted?: string;
-  AccSystemCode: string;
+
+  private _JournalEntryModel: IBaseRepository<JournalEntryModel> =
+    new JournalEntryModel();
+  protected _BaseRepository: IBaseRepository;
+
+  _TableName: string;
+  _ObjectId: string;
+  _ObjectName: string;
+
   journalEntryRepository: JournalEntryRepository;
   ledgerTransactionRepository: LedgerTransactionRepository;
   private _DebitTransactions: any = null;
   private _CreditTransactions: any = null;
 
-  constructor(
-    journalEntryRepository?: JournalEntryRepository,
-    ledgerTransactionRepository?: LedgerTransactionRepository,
-  ) {
+  get JournalEntryId() {
+    return this._JournalEntryId;
+  }
+
+  private set JournalEntryId(id: string) {
+    this._JournalEntryId = id;
+  }
+
+  override get BaseRepository() {
+    return this._JournalEntryModel;
+  }
+
+  override get TableName() {
+    return 'finance_JournalEntry';
+  }
+
+  override get ObjectName() {
+    return this.Name;
+  }
+
+  override get ObjectId() {
+    return this._JournalEntryId;
+  }
+
+  constructor(dbTransaction: any);
+  constructor(dbTransaction: any, journalEntryId: string);
+  constructor(dbTransaction: any, journalEntryId?: string) {
     super();
-    this.ledgerTransactionRepository = ledgerTransactionRepository;
-    this.journalEntryRepository = journalEntryRepository;
+    this.journalEntryRepository = this.ledgerTransactionRepository.findOne({
+      where: {
+        JournalEntryId: journalEntryId,
+      },
+      transaction: dbTransaction,
+    });
   }
 
   public get DebitTransactions() {
@@ -99,7 +131,7 @@ export class JournalEntry extends AccountSystemEntity {
       Description: this.Description,
       PostedById: this.PostedById,
       PostedToAccSystemYN: this.PostedToAccSystemYN,
-      DatePosted: this.DatePosted,
+      PostedDateTime: this.PostedDateTime,
     };
   }
 
@@ -116,7 +148,7 @@ export class JournalEntry extends AccountSystemEntity {
         Description: this.Description,
         PostedById: userId,
         PostedToAccSystemYN: this.PostedToAccSystemYN,
-        DatePosted: this.DatePosted,
+        PostedDateTime: this.PostedDateTime,
       },
       dbTransaction,
     );
@@ -127,12 +159,14 @@ export class JournalEntry extends AccountSystemEntity {
     transactionType,
   }: ILedgerTransactionTypeOptionsAttr): Promise<any> {
     this.init({
+      CompanyId: cuid(),
       JournalEntryId: 'New',
       Date: new Date(),
       Name: '',
       Description: '',
-      PostedById: '',
+      AccSystemRefId: '',
       PostedToAccSystemYN: 'N',
+      PostedById: '',
       PostedDateTime: null,
     });
 

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

@@ -1,88 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, DataType, Model, Table, HasMany } from 'sequelize-typescript';
-import { FinanceCustomerModel } from '../../customer/entities/customer.entity';
-
-@Table({ tableName: 'finance_Company', createdAt: false, updatedAt: false })
-export class FinanceCompanyModel extends Model {
-  @ApiProperty({ type: String, description: 'CompanyId' })
-  @Column({
-    primaryKey: true,
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  CompanyId: string;
-
-  @ApiProperty({
-    type: String,
-    description: 'CompanySystemCode',
-  })
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(10),
-  })
-  CompSystemCode: string;
-
-  @ApiProperty({
-    type: String,
-    description: 'CompanySystemRefId',
-  })
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  CompSystemRefId: string;
-
-  @ApiProperty({
-    type: String,
-    description: 'Account System Code eg. "EZC", "CRM"',
-  })
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(10),
-  })
-  AccSystemCode: string;
-
-  @ApiProperty({
-    type: String,
-    description: 'Account Company Id in API',
-  })
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  AccSystemRefId: string;
-
-  @ApiProperty({
-    type: String,
-    description: 'PostedToAccSystemYN',
-    example: 'Y',
-  })
-  @Column({
-    allowNull: false,
-    type: DataType.CHAR(1),
-  })
-  PostedToAccSystemYN: string;
-
-  @ApiProperty({
-    example: '138140891dd211b288d34bc7b4312a49',
-    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(() => FinanceCustomerModel)
-  FinanceCustomers: FinanceCustomerModel[];
-}

package/src/finance-company/interfaces/finance-company-attr.interface.ts

@@ -1,10 +0,0 @@
-export interface IFinanceCompanyAttr {
-  CompanyId: string;
-  CompSystemCode: string;
-  CompSystemRefId: string;
-  AccSystemCode: string;
-  AccSystemRefId: string;
-  PostedToAccSystemYN: string;
-  PostedById: string;
-  PostedDateTime?: Date;
-}

package/src/finance-company/interfaces/finance-company.repository.interface.ts

@@ -1,4 +0,0 @@
-import { IBaseRepository } from '@tomei/general';
-import { FinanceCompanyModel } from '../entities/finance-company.entity';
-
-export type IFinanceCompanyRepository = IBaseRepository<FinanceCompanyModel>;