ORV2-4162 BE Fin, SA Refund to Credit Account Payment (#2171)

Author: praju-aot

vehicles/src/modules/permit-application-payment/permit/company-permit.controller.ts

@@ -99,7 +99,6 @@ export class CompanyPermitController {
     isArray: true,
   })
   @Permissions({
-    allowedBCeIDRoles: CLIENT_USER_ROLE_LIST,
     allowedIdirRoles: IDIR_USER_ROLE_LIST,
   })
   @Get('/:permitId/history')

vehicles/src/modules/permit-application-payment/permit/dto/response/permit-history.dto.ts

@@ -3,6 +3,10 @@ import { ApiProperty } from '@nestjs/swagger';
 import { TransactionType } from '../../../../../common/enum/transaction-type.enum';
 import { PaymentMethodType } from 'src/common/enum/payment-method-type.enum';
 import { PaymentCardType } from 'src/common/enum/payment-card-type.enum';
+import {
+  CreditAccountStatus,
+  CreditAccountStatusType,
+} from '../../../../../common/enum/credit-account-status-type.enum';
 
 export class PermitHistoryDto {
   @AutoMap()
@@ -112,4 +116,19 @@ export class PermitHistoryDto {
       'Represents the approval result of a transaction. 0 = Transaction refused, 1 = Transaction approved',
   })
   pgApproved: number;
+
+  @AutoMap()
+  @ApiProperty({
+    example: '1',
+    description: 'Represents the credit account id used for a transaction.',
+  })
+  creditAccountId?: number;
+
+  @AutoMap()
+  @ApiProperty({
+    example: CreditAccountStatus.ACCOUNT_ACTIVE,
+    description:
+      'Represents the current status of the credit account used for transaction',
+  })
+  creditAccountStatusType?: CreditAccountStatusType;
 }

vehicles/src/modules/permit-application-payment/permit/permit.service.ts

@@ -447,10 +447,12 @@ export class PermitService {
       .leftJoinAndSelect('permit.company', 'company')
       .innerJoinAndSelect('permit.permitTransactions', 'permitTransactions')
       .innerJoinAndSelect('permitTransactions.transaction', 'transaction')
+      .leftJoinAndSelect('transaction.creditAccount', 'creditAccount')
       .where('permit.permitNumber IS NOT NULL')
       .andWhere('permit.originalPermitId = :originalPermitId', {
         originalPermitId: originalPermitId,
       })
+      .andWhere('transaction.transactionApprovedDate IS NOT NULL')
       .andWhere('company.companyId = :companyId', { companyId: companyId })
       .orderBy('transaction.transactionSubmitDate', 'DESC')
       .getMany();
@@ -475,6 +477,11 @@ export class PermitService {
         transactionApprovedDate:
           permitTransaction.transaction.transactionApprovedDate,
         pgApproved: permitTransaction.transaction.pgApproved,
+        creditAccountId:
+          permitTransaction?.transaction?.creditAccount?.creditAccountId,
+        creditAccountStatusType:
+          permitTransaction?.transaction?.creditAccount
+            ?.creditAccountStatusType,
       })),
     ) as PermitHistoryDto[];
   }