@tomei/finance 0.6.43 → 0.6.44

package/package.json

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

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

@@ -8,4 +8,10 @@ export class JournalEntryRepository
   constructor() {
     super(JournalEntryModel);
   }
+
+  async count(dbTransaction?: any) {
+    return await JournalEntryModel.count({
+      transaction: dbTransaction,
+    });
+  }
 }

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

@@ -56,35 +56,7 @@ export default class JournalEntry extends AccountSystemEntity {
     if (dbTransaction) {
       this._DbTransaction = dbTransaction;
     }
-    if (journalEntryId) {
-      this.RepositoryBase.findOne({
-        where: {
-          JournalEntryId: journalEntryId,
-        },
-        transaction: dbTransaction,
-      })
-        .then((journalEntryData) => {
-          if (journalEntryData) {
-            this.CompanyId = journalEntryData.CompanyId;
-            this.Date = journalEntryData.Date;
-            this.Name = journalEntryData.Name;
-            this.Description = journalEntryData.Description;
-            this.AccSystemRefId = journalEntryData.AccSystemRefId;
-            this.PostedToAccSystemYN = journalEntryData.PostedToAccSystemYN;
-            this.PostedById = journalEntryData.PostedById;
-            this.PostedDateTime = journalEntryData.PostedDateTime;
-          } else {
-            const notFoundError = new RecordNotFoundError(
-              'JournalEntryErrMsg',
-              'No Record Found.',
-            );
-            throw notFoundError;
-          }
-        })
-        .catch((err) => {
-          console.log('Journal entry constructor err: ', err);
-        });
-    } else {
+    if (!journalEntryId) {
       this.init({
         JournalEntryId: 'New',
         CompanyId: '',
@@ -99,6 +71,51 @@ export default class JournalEntry extends AccountSystemEntity {
     }
   }
 
+  public static async initJournalEntry(
+    dbTransaction?: any,
+    journalEntryId?: string,
+  ): Promise<JournalEntry> {
+    try {
+      if (journalEntryId) {
+        const journalEntryData = await JournalEntry._RepositoryBase.findOne({
+          where: {
+            JournalEntryId: journalEntryId,
+          },
+          transaction: dbTransaction,
+        });
+
+        if (journalEntryData) {
+          const journalEntry = new JournalEntry();
+          journalEntry.init({
+            JournalEntryId: journalEntryData.JournalEntryId,
+            CompanyId: journalEntryData.CompanyId,
+            Date: new Date(),
+            Name: journalEntryData.Name,
+            Description: journalEntryData.Description,
+            AccSystemRefId: journalEntryData.AccSystemRefId,
+            PostedToAccSystemYN: journalEntryData.PostedToAccSystemYN,
+            PostedById: journalEntryData.PostedById,
+            PostedDateTime: journalEntryData.PostedDateTime,
+          });
+
+          return journalEntry;
+        } else {
+          const notFoundError = new RecordNotFoundError(
+            'JournalEntryErrMsg',
+            'No Record Found.',
+          );
+          throw notFoundError;
+        }
+      } else {
+        const journalEntry = new JournalEntry(dbTransaction);
+
+        return journalEntry;
+      }
+    } catch (error) {
+      throw error;
+    }
+  }
+
   get DebitTransactions(): Promise<LedgerTransaction[]> {
     return new Promise((resolve, reject) => {
       if (this.JournalEntryId !== 'New') {
@@ -189,13 +206,17 @@ export default class JournalEntry extends AccountSystemEntity {
     };
   }
 
-  async create() {
-    return await this.RepositoryBase.create(this.getData);
+  async create(dbTransaction?: any) {
+    return await this.RepositoryBase.create(this.getData, {
+      transaction: dbTransaction,
+    });
   }
 
   async save(userId: string, dbTransaction?: any): Promise<JournalEntryModel> {
     try {
-      this.JournalEntryId = cuid();
+      const count = await this.RepositoryBase.count(dbTransaction);
+      this.JournalEntryId = `${count + 1}`;
+
       const data = await this.RepositoryBase.create(
         {
           JournalEntryId: this.JournalEntryId,