Fix: Get Credit Account endpoint when the Account is closed (#1469)

bcgov · Jul 11, 2024 · dbe8e4b · dbe8e4b
1 parent 4ad095c
commit dbe8e4b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/vehicles/src/modules/credit-account/credit-account.service.ts b/vehicles/src/modules/credit-account/credit-account.service.ts
@@ -242,7 +242,7 @@ export class CreditAccountService {
   }
 
   @LogAsyncMethodExecution()
-  async getCreditAccount(currentUser: IUserJWT, companyId: number) {   
+  async getCreditAccount(currentUser: IUserJWT, companyId: number) {
     let creditAccount = await this.creditAccountRepository.findOne({
       where: {
         company: { companyId },
@@ -259,7 +259,7 @@ export class CreditAccountService {
       creditAccount?.creditAccountStatusType ===
         CreditAccountStatus.ACCOUNT_CLOSED
     ) {
-      creditAccount = await this.creditAccountRepository.findOne({
+      const accountDetailsForUser = await this.creditAccountRepository.findOne({
         where: {
           creditAccountUsers: { company: { companyId }, isActive: true },
         },
@@ -269,7 +269,11 @@ export class CreditAccountService {
           creditAccountActivities: { idirUser: true },
         },
       });
+      if (accountDetailsForUser) {
+        creditAccount = accountDetailsForUser;
+      }
     }
+
     if (!creditAccount) {
       throw new DataNotFoundException();
     }