@tomei/finance 0.6.8 → 0.6.9

package/package.json

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

package/src/document/document.ts

@@ -131,57 +131,36 @@ export default class Document extends AccountSystemEntity {
     return 'finance_Document';
   }
 
-  constructor(dbTransaction?: any, docNo?: string) {
+  constructor(dbTransaction?: any, documentData?: any) {
     super();
     if (dbTransaction) {
       this._DbTransaction = dbTransaction;
     }
-    if (docNo) {
-      this.DocNo = docNo;
-      this.RepositoryBase.findOne({
-        where: {
-          DocNo: this.DocNo,
-        },
-        transaction: dbTransaction,
-      })
-        .then((documentData) => {
-          if (documentData) {
-            this.DocType = documentData.DocType;
-            this.DocDate = documentData.DocDate;
-            this.CompanyId = documentData.CompanyId;
-            this.Currency = documentData.Currency;
-            this.Amount = documentData.Amount;
-            this.Description = documentData.Description;
-            this.Status = documentData.Status;
-            this.IssuedById = documentData.IssuedById;
-            this.IssuedToId = documentData.IssuedToId;
-            this.IssuedToType = documentData.IssuedToType;
-            this.RelatedObjectId = documentData.RelatedObjectId;
-            this.RelatedObjectType = documentData.RelatedObjectType;
-            this.CreatedById = documentData.CreatedById;
-            this.CreatedAt = documentData.CreatedAt;
-            this.UpdatedById = documentData.UpdatedById;
-            this.UpdatedAt = documentData.UpdatedAt;
-            this.DocPDFFileMediaId = documentData.DocPDFFileMediaId;
-            this.DocHTMLFileMediaId = documentData.DocHTMLFileMediaId;
-            this.AccSystemRefId = documentData.AccSystemRefId;
-            this.PostedToAccSystemYN = documentData.PostedToAccSystemYN;
-            this.PostedById = documentData.PostedById;
-            this.PostedDateTime = documentData.PostedDateTime;
-            this.UseAccSystemDocYN = documentData.UseAccSystemDocYN;
-            this.IsNewRecord = false;
-          } else {
-            const notFoundError = new RecordNotFoundError(
-              'FinanceDocumentErrMsg',
-              'No Record Found.',
-            );
-            throw notFoundError;
-          }
-        })
-        .catch((err) => {
-          // tslint:disable-next-line:no-console
-          console.log('Document Class constructor err: ', err);
-        });
+    if (documentData) {
+      this.DocType = documentData.DocType;
+      this.DocDate = documentData.DocDate;
+      this.CompanyId = documentData.CompanyId;
+      this.Currency = documentData.Currency;
+      this.Amount = documentData.Amount;
+      this.Description = documentData.Description;
+      this.Status = documentData.Status;
+      this.IssuedById = documentData.IssuedById;
+      this.IssuedToId = documentData.IssuedToId;
+      this.IssuedToType = documentData.IssuedToType;
+      this.RelatedObjectId = documentData.RelatedObjectId;
+      this.RelatedObjectType = documentData.RelatedObjectType;
+      this.CreatedById = documentData.CreatedById;
+      this.CreatedAt = documentData.CreatedAt;
+      this.UpdatedById = documentData.UpdatedById;
+      this.UpdatedAt = documentData.UpdatedAt;
+      this.DocPDFFileMediaId = documentData.DocPDFFileMediaId;
+      this.DocHTMLFileMediaId = documentData.DocHTMLFileMediaId;
+      this.AccSystemRefId = documentData.AccSystemRefId;
+      this.PostedToAccSystemYN = documentData.PostedToAccSystemYN;
+      this.PostedById = documentData.PostedById;
+      this.PostedDateTime = documentData.PostedDateTime;
+      this.UseAccSystemDocYN = documentData.UseAccSystemDocYN;
+      this.IsNewRecord = false;
     }
   }
 
@@ -214,7 +193,6 @@ export default class Document extends AccountSystemEntity {
 
   public static async initDocument(dbTransaction: any, docNo: string) {
     try {
-      const document = new Document(dbTransaction);
       const documentData = await this._RepositoryBase.findOne({
         where: {
           DocNo: docNo,
@@ -226,31 +204,34 @@ export default class Document extends AccountSystemEntity {
         ],
       });
       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;
+        const document = new Document(dbTransaction, {
+          DocNo: documentData.DocNo,
+          DocType: documentData.DocType,
+          CompanyId: documentData.CompanyId,
+          DocDate: documentData.DocDate,
+          Currency: documentData.Currency,
+          Amount: documentData.Amount,
+          Description: documentData.Description,
+          Status: documentData.Status,
+          IssuedById: documentData.IssuedById,
+          IssuedToId: documentData.IssuedToId,
+          IssuedToType: documentData.IssuedToType,
+          RelatedObjectId: documentData.RelatedObjectId,
+          RelatedObjectType: documentData.RelatedObjectType,
+          CreatedById: documentData.CreatedById,
+          CreatedAt: documentData.CreatedAt,
+          UpdatedById: documentData.UpdatedById,
+          UpdatedAt: documentData.UpdatedAt,
+          DocPDFFileMediaId: documentData.DocPDFFileMediaId,
+          DocHTMLFileMediaId: documentData.DocHTMLFileMediaId,
+          AccSystemRefId: documentData.AccSystemRefId,
+          PostedToAccSystemYN: documentData.PostedToAccSystemYN,
+          PostedById: documentData.PostedById,
+          PostedDateTime: documentData.PostedDateTime,
+          UseAccSystemDocYN: documentData.UseAccSystemDocYN,
+        });
+
+        return document;
       } else {
         const notFoundError = new ClassError(
           'Document',
@@ -260,7 +241,6 @@ export default class Document extends AccountSystemEntity {
 
         throw notFoundError;
       }
-      return documentData;
     } catch (error) {
       throw error;
     }