diff --git a/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/fines-draft-table-wrapper.component.html b/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/fines-draft-table-wrapper.component.html
index fa5b5797a1..c6484f71b4 100644
--- a/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/fines-draft-table-wrapper.component.html
+++ b/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/fines-draft-table-wrapper.component.html
@@ -97,8 +97,8 @@
{{ row['Account'] }}
diff --git a/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/interfaces/fines-draft-table-wrapper-table-data.interface.ts b/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/interfaces/fines-draft-table-wrapper-table-data.interface.ts
index c4dc21acc0..cbf4b98d76 100644
--- a/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/interfaces/fines-draft-table-wrapper-table-data.interface.ts
+++ b/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/interfaces/fines-draft-table-wrapper-table-data.interface.ts
@@ -2,7 +2,8 @@ import { IAbstractTableData } from '@hmcts/opal-frontend-common/components/abstr
import { SortableValuesType } from '@hmcts/opal-frontend-common/components/abstract/abstract-sortable-table/types';
export interface IFinesDraftTableWrapperTableData extends IAbstractTableData {
- Account: string;
+ Account: string | null;
+ 'Account id': number;
ChangedDate: string;
Changed: number;
'Defendant id': number;
diff --git a/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/mocks/fines-draft-table-wrapper-table-data.mock.ts b/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/mocks/fines-draft-table-wrapper-table-data.mock.ts
index 438edddf05..42bfd53a95 100644
--- a/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/mocks/fines-draft-table-wrapper-table-data.mock.ts
+++ b/src/app/flows/fines/fines-draft/fines-draft-table-wrapper/mocks/fines-draft-table-wrapper-table-data.mock.ts
@@ -3,6 +3,7 @@ import { IFinesDraftTableWrapperTableData } from '../interfaces/fines-draft-tabl
export const FINES_DRAFT_TABLE_WRAPPER_TABLE_DATA_MOCK: IFinesDraftTableWrapperTableData[] = [
{
Account: 'ACC1234567890',
+ 'Account id': 123,
'Defendant id': 101,
Defendant: 'John Doe',
'Date of birth': '1985-06-15',
@@ -16,6 +17,7 @@ export const FINES_DRAFT_TABLE_WRAPPER_TABLE_DATA_MOCK: IFinesDraftTableWrapperT
},
{
Account: 'ACC0987654321',
+ 'Account id': 456,
'Defendant id': 202,
Defendant: 'Jane Smith',
'Date of birth': '1990-09-25',
diff --git a/src/app/flows/fines/fines-draft/services/fines-draft.service.ts b/src/app/flows/fines/fines-draft/services/fines-draft.service.ts
index e8ce9cff2d..9beb0745ee 100644
--- a/src/app/flows/fines/fines-draft/services/fines-draft.service.ts
+++ b/src/app/flows/fines/fines-draft/services/fines-draft.service.ts
@@ -35,24 +35,27 @@ export class FinesDraftService {
* @returns {IFinesDraftTableWrapperTableData[]} An array of table data objects.
*/
public populateTableData(response: IOpalFinesDraftAccountsResponse): IFinesDraftTableWrapperTableData[] {
- return response.summaries.map(({ draft_account_id, account_snapshot, account_status_date, account_number }) => {
- const { defendant_name, date_of_birth, created_date, account_type, business_unit_name, submitted_by_name } =
- account_snapshot;
+ return response.summaries.map(
+ ({ draft_account_id, account_snapshot, account_status_date, account_number, account_id }) => {
+ const { defendant_name, date_of_birth, created_date, account_type, business_unit_name, submitted_by_name } =
+ account_snapshot;
- return {
- Account: account_number,
- ChangedDate: account_status_date,
- Changed: this.dateService.getDaysAgo(account_status_date),
- 'Defendant id': draft_account_id,
- Defendant: defendant_name,
- 'Date of birth': date_of_birth,
- CreatedDate: created_date,
- Created: this.dateService.getDaysAgo(created_date),
- 'Account type': FINES_ACCOUNT_TYPES[account_type as keyof typeof FINES_ACCOUNT_TYPES],
- 'Business unit': business_unit_name,
- 'Submitted by': submitted_by_name,
- };
- });
+ return {
+ Account: account_number,
+ 'Account id': account_id || 0,
+ ChangedDate: account_status_date,
+ Changed: this.dateService.getDaysAgo(account_status_date),
+ 'Defendant id': draft_account_id,
+ Defendant: defendant_name,
+ 'Date of birth': date_of_birth,
+ CreatedDate: created_date,
+ Created: this.dateService.getDaysAgo(created_date),
+ 'Account type': FINES_ACCOUNT_TYPES[account_type as keyof typeof FINES_ACCOUNT_TYPES],
+ 'Business unit': business_unit_name,
+ 'Submitted by': submitted_by_name,
+ };
+ },
+ );
}
/**
diff --git a/src/app/flows/fines/services/opal-fines-service/interfaces/opal-fines-draft-accounts-summary.interface.ts b/src/app/flows/fines/services/opal-fines-service/interfaces/opal-fines-draft-accounts-summary.interface.ts
index 3611f34471..9db4ce3258 100644
--- a/src/app/flows/fines/services/opal-fines-service/interfaces/opal-fines-draft-accounts-summary.interface.ts
+++ b/src/app/flows/fines/services/opal-fines-service/interfaces/opal-fines-draft-accounts-summary.interface.ts
@@ -3,17 +3,22 @@ export interface IOpalFinesDraftAccountsSummary {
created_at: string;
submitted_by: string;
business_unit_id: number;
+ validated_at: string | null;
+ validated_by: string | null;
account_snapshot: IOpalFinesAccountSnapshot;
account_type: string;
account_status: string;
- account_status_date: string;
account_number: string;
+ account_id: number | null;
+ account_status_date: string;
+ submitted_by_name: string;
}
interface IOpalFinesAccountSnapshot {
account_type: string;
created_date: string;
submitted_by: string;
+ approved_date: string;
defendant_name: string;
submitted_by_name: string;
business_unit_name: string;
diff --git a/src/app/flows/fines/services/opal-fines-service/mocks/opal-fines-draft-accounts.mock.ts b/src/app/flows/fines/services/opal-fines-service/mocks/opal-fines-draft-accounts.mock.ts
index 875c1f144b..75da1bcc97 100644
--- a/src/app/flows/fines/services/opal-fines-service/mocks/opal-fines-draft-accounts.mock.ts
+++ b/src/app/flows/fines/services/opal-fines-service/mocks/opal-fines-draft-accounts.mock.ts
@@ -16,11 +16,16 @@ export const OPAL_FINES_DRAFT_ACCOUNTS_MOCK: IOpalFinesDraftAccountsResponse = {
submitted_by_name: 'User One',
business_unit_name: 'Business Unit A',
date_of_birth: '1990-05-15',
+ approved_date: '',
},
account_type: 'TYPE_A',
account_status: 'ACTIVE',
account_status_date: '2023-01-01',
account_number: 'TESTACC123',
+ account_id: 123,
+ validated_at: null,
+ validated_by: null,
+ submitted_by_name: 'User One',
},
{
draft_account_id: 102,
@@ -35,11 +40,16 @@ export const OPAL_FINES_DRAFT_ACCOUNTS_MOCK: IOpalFinesDraftAccountsResponse = {
submitted_by_name: 'User Two',
business_unit_name: 'Business Unit B',
date_of_birth: null,
+ approved_date: '',
},
account_type: 'TYPE_B',
account_status: 'PENDING',
account_status_date: '2023-01-02',
account_number: 'TESTACC123',
+ account_id: null,
+ validated_at: null,
+ validated_by: null,
+ submitted_by_name: 'User Two',
},
],
};
|