@tomei/finance 0.6.4 → 0.6.5

package/package.json

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

package/src/document/document-item.ts

@@ -1,6 +1,8 @@
 import Document from './document';
 import { ObjectBase } from '@tomei/general';
 import { DocumentItemRepository } from './document-item.repository';
+import { ClassError } from '@tomei/general';
+import { IDocumentItemAttr } from './interfaces/document-item-attr.interface';
 
 export default class DocumentItem extends ObjectBase {
   DocumentItemId = 'New';
@@ -72,26 +74,60 @@ export default class DocumentItem extends ObjectBase {
     this._Document = document;
   }
 
-  init(data: any) {
-    this.DocumentItemId = data.DocumentItemId || this.DocumentItemId;
-    this.DocNo = data.DocNo || this.DocNo;
-    this.Name = data.Name || this.Name;
-    this.NameBM = data.NameBM || this.NameBM;
-    this.Description = data.Description || this.Description;
-    this.ItemId = data.ItemId || this.ItemId;
-    this.ItemType = data.ItemType || this.ItemType;
-    this.ItemSKU = data.ItemSKU || this.ItemSKU;
-    this.ItemSerialNo = data.ItemSerialNo || this.ItemSerialNo;
-    this.Currency = data.Currency || this.Currency;
-    this.UnitPrice = data.UnitPrice || this.UnitPrice;
-    this.Quantity = data.Quantity || this.Quantity;
-    this.QuantityUOM = data.QuantityUOM || this.QuantityUOM;
-    this._Amount = data.Amount || this._Amount;
-    this.TaxCode = data.TaxCode || this.TaxCode;
-    this.TaxAmount = data.TaxAmount || this.TaxAmount;
-    this.TaxRate = data.TaxRate || this.TaxRate;
-    this.TaxInclusiveYN = data.TaxInclusiveYN || this.TaxInclusiveYN;
-    this.DtAccountNo = data.DtAccountNo || this.DtAccountNo;
-    this.CtAccountNo = data.CtAccountNo || this.CtAccountNo;
+  init(params: IDocumentItemAttr) {
+    this.DocumentItemId = params.DocumentItemId || this.DocumentItemId;
+    this.DocNo = params.DocNo || this.DocNo;
+    this.Name = params.Name || this.Name;
+    this.NameBM = params.NameBM || this.NameBM;
+    this.Description = params.Description || this.Description;
+    this.ItemId = params.ItemId || this.ItemId;
+    this.ItemType = params.ItemType || this.ItemType;
+    this.ItemSKU = params.ItemSKU || this.ItemSKU;
+    this.ItemSerialNo = params.ItemSerialNo || this.ItemSerialNo;
+    this.Currency = params.Currency || this.Currency;
+    this.UnitPrice = params.UnitPrice || this.UnitPrice;
+    this.Quantity = params.Quantity || this.Quantity;
+    this.QuantityUOM = params.QuantityUOM || this.QuantityUOM;
+    this._Amount = params.Amount || this._Amount;
+    this.TaxCode = params.TaxCode || this.TaxCode;
+    this.TaxAmount = params.TaxAmount || this.TaxAmount;
+    this.TaxRate = params.TaxRate || this.TaxRate;
+    this.TaxInclusiveYN = params.TaxInclusiveYN || this.TaxInclusiveYN;
+    this.DtAccountNo = params.DtAccountNo || this.DtAccountNo;
+    this.CtAccountNo = params.CtAccountNo || this.CtAccountNo;
+  }
+
+  public static async initDocumentItems(
+    dbTransaction: any,
+    document: Document,
+  ) {
+    try {
+      const documentItems = await this._RepositoryBase.findAll({
+        where: {
+          DocNo: document.DocNo,
+        },
+        transaction: dbTransaction,
+      });
+
+      if (documentItems) {
+        const documentItemObjects = documentItems.map((documentItem) => {
+          const di = new DocumentItem(dbTransaction, document);
+          di.init({ ...documentItem.get({ plain: true }) });
+          return di;
+        });
+
+        return documentItemObjects;
+      } else {
+        const notFoundError = new ClassError(
+          'Document',
+          'InitDocumentItemErrMsg00',
+          `No Document Item record found.`,
+        );
+
+        throw notFoundError;
+      }
+    } catch (error) {
+      throw error;
+    }
   }
 }

package/src/document/document.ts

@@ -1,4 +1,5 @@
 import * as util from 'util';
+import * as path from 'path';
 import * as fs from 'fs';
 import * as puppeteer from 'puppeteer';
 import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
@@ -19,7 +20,7 @@ import { AccountSystemEntity } from '../account-system-entity/account-system-ent
 import { DocumentRepository } from './document.repository';
 import FinanceCustomerBase from '../customer/customer';
 import DocumentModel from '../models/document.entity';
-import * as path from 'path';
+import DocumentItemModel from '../models/document-item.entity';
 import { ClassError, LoginUserBase } from '@tomei/general';
 import { ApplicationConfig } from '@tomei/config';
 import { Op } from 'sequelize';
@@ -145,7 +146,6 @@ export default class Document extends AccountSystemEntity {
       })
         .then((documentData) => {
           if (documentData) {
-            this.IsNewRecord = false;
             this.DocType = documentData.DocType;
             this.DocDate = documentData.DocDate;
             this.CompanyId = documentData.CompanyId;
@@ -185,47 +185,85 @@ export default class Document extends AccountSystemEntity {
     }
   }
 
+  init(params: IDocumentAttr) {
+    this.DocNo = params.DocNo;
+    this.DocType = params.DocType;
+    this.DocDate = params.DocDate;
+    this.CompanyId = params.CompanyId;
+    this.Currency = params.Currency;
+    this.Amount = params.Amount;
+    this.Description = params.Description;
+    this.Status = params.Status;
+    this.IssuedById = params.IssuedById;
+    this.IssuedToId = params.IssuedToId;
+    this.IssuedToType = params.IssuedToType;
+    this.RelatedObjectId = params.RelatedObjectId;
+    this.RelatedObjectType = params.RelatedObjectType;
+    this.CreatedById = params.CreatedById;
+    this.CreatedAt = params.CreatedAt;
+    this.UpdatedById = params.UpdatedById;
+    this.UpdatedAt = params.UpdatedAt;
+    this.DocPDFFileMediaId = params.DocPDFFileMediaId;
+    this.DocHTMLFileMediaId = params.DocHTMLFileMediaId;
+    this.AccSystemRefId = params.AccSystemRefId;
+    this.PostedToAccSystemYN = params.PostedToAccSystemYN;
+    this.PostedById = params.PostedById;
+    this.PostedDateTime = params.PostedDateTime;
+    this.UseAccSystemDocYN = params.UseAccSystemDocYN;
+  }
+
   public static async initDocument(dbTransaction: any, docNo: string) {
-    const document = new Document(dbTransaction);
-    const documentData = await this._RepositoryBase.findOne({
-      where: {
-        DocNo: docNo,
-      },
-    });
-    if (documentData) {
-      document.IsNewRecord = false;
-      document.DocType = documentData.DocType;
-      document.DocDate = documentData.DocDate;
-      document.CompanyId = documentData.CompanyId;
-      document.Currency = documentData.Currency;
-      document.Amount = documentData.Amount;
-      document.Description = documentData.Description;
-      document.Status = documentData.Status;
-      document.IssuedById = documentData.IssuedById;
-      document.IssuedToId = documentData.IssuedToId;
-      document.IssuedToType = documentData.IssuedToType;
-      document.RelatedObjectId = documentData.RelatedObjectId;
-      document.RelatedObjectType = documentData.RelatedObjectType;
-      document.CreatedById = documentData.CreatedById;
-      document.CreatedAt = documentData.CreatedAt;
-      document.UpdatedById = documentData.UpdatedById;
-      document.UpdatedAt = documentData.UpdatedAt;
-      document.DocPDFFileMediaId = documentData.DocPDFFileMediaId;
-      document.DocHTMLFileMediaId = documentData.DocHTMLFileMediaId;
-      document.AccSystemRefId = documentData.AccSystemRefId;
-      document.PostedToAccSystemYN = documentData.PostedToAccSystemYN;
-      document.PostedById = documentData.PostedById;
-      document.PostedDateTime = documentData.PostedDateTime;
-      document.UseAccSystemDocYN = documentData.UseAccSystemDocYN;
-      document.IsNewRecord = false;
-    } else {
-      const notFoundError = new RecordNotFoundError(
-        'FinanceDocumentErrMsg',
-        'No Record Found.',
-      );
-      throw notFoundError;
+    try {
+      const document = new Document(dbTransaction);
+      const documentData = await this._RepositoryBase.findOne({
+        where: {
+          DocNo: docNo,
+        },
+        include: [
+          {
+            model: DocumentItemModel,
+          },
+        ],
+      });
+      if (documentData) {
+        document.DocNo = documentData.DocNo;
+        document.DocType = documentData.DocType;
+        document.DocDate = documentData.DocDate;
+        document.CompanyId = documentData.CompanyId;
+        document.Currency = documentData.Currency;
+        document.Amount = documentData.Amount;
+        document.Description = documentData.Description;
+        document.Status = documentData.Status;
+        document.IssuedById = documentData.IssuedById;
+        document.IssuedToId = documentData.IssuedToId;
+        document.IssuedToType = documentData.IssuedToType;
+        document.RelatedObjectId = documentData.RelatedObjectId;
+        document.RelatedObjectType = documentData.RelatedObjectType;
+        document.CreatedById = documentData.CreatedById;
+        document.CreatedAt = documentData.CreatedAt;
+        document.UpdatedById = documentData.UpdatedById;
+        document.UpdatedAt = documentData.UpdatedAt;
+        document.DocPDFFileMediaId = documentData.DocPDFFileMediaId;
+        document.DocHTMLFileMediaId = documentData.DocHTMLFileMediaId;
+        document.AccSystemRefId = documentData.AccSystemRefId;
+        document.PostedToAccSystemYN = documentData.PostedToAccSystemYN;
+        document.PostedById = documentData.PostedById;
+        document.PostedDateTime = documentData.PostedDateTime;
+        document.UseAccSystemDocYN = documentData.UseAccSystemDocYN;
+        document.IsNewRecord = false;
+      } else {
+        const notFoundError = new ClassError(
+          'Document',
+          'InitDocumentErrMsg00',
+          `No Document record found.`,
+        );
+
+        throw notFoundError;
+      }
+      return documentData;
+    } catch (error) {
+      throw error;
     }
-    return document;
   }
 
   /**
@@ -243,23 +281,9 @@ export default class Document extends AccountSystemEntity {
   get DocumentItems(): Promise<DocumentItem[]> {
     return new Promise((resolve, reject) => {
       if (!this.IsNewRecord) {
-        Document._DocumentItemRepository
-          .findAll({
-            where: {
-              DocNo: this.DocNo,
-            },
-            transaction: this._DbTransaction,
-          })
+        DocumentItem.initDocumentItems(this._DbTransaction, this)
           .then((documentItems) => {
-            const documentItemObjects = documentItems.map((documentItem) => {
-              const di = new DocumentItem(this._DbTransaction, this);
-              di.init({ ...documentItem.get({ plain: true }) });
-            });
-            return Promise.all(documentItemObjects);
-          })
-          .then((documentItemObjects) => {
-            this._DocumentItems = documentItemObjects;
-            resolve(this._DocumentItems);
+            return Promise.all(documentItems);
           })
           .catch((err) => {
             reject(err);
@@ -787,33 +811,6 @@ export default class Document extends AccountSystemEntity {
     })();
   }
 
-  init(params: IDocumentAttr) {
-    this.DocNo = params.DocNo;
-    this.DocType = params.DocType;
-    this.DocDate = params.DocDate;
-    this.CompanyId = params.CompanyId;
-    this.Currency = params.Currency;
-    this.Amount = params.Amount;
-    this.Description = params.Description;
-    this.Status = params.Status;
-    this.IssuedById = params.IssuedById;
-    this.IssuedToId = params.IssuedToId;
-    this.IssuedToType = params.IssuedToType;
-    this.RelatedObjectId = params.RelatedObjectId;
-    this.RelatedObjectType = params.RelatedObjectType;
-    this.CreatedById = params.CreatedById;
-    this.CreatedAt = params.CreatedAt;
-    this.UpdatedById = params.UpdatedById;
-    this.UpdatedAt = params.UpdatedAt;
-    this.DocPDFFileMediaId = params.DocPDFFileMediaId;
-    this.DocHTMLFileMediaId = params.DocHTMLFileMediaId;
-    this.AccSystemRefId = params.AccSystemRefId;
-    this.PostedToAccSystemYN = params.PostedToAccSystemYN;
-    this.PostedById = params.PostedById;
-    this.PostedDateTime = params.PostedDateTime;
-    this.UseAccSystemDocYN = params.UseAccSystemDocYN;
-  }
-
   /**
    * Returns generated HTML & PDF Invoice Media
    *