diff --git a/server/@types/managingAppsApi.ts b/server/@types/managingAppsApi.ts index 166508e..3487c04 100644 --- a/server/@types/managingAppsApi.ts +++ b/server/@types/managingAppsApi.ts @@ -31,7 +31,7 @@ export interface Application { id: string reference: string assignedGroup: AssignedGroup - type: string + appType: string requestedBy: RequestedBy requestedDate: string createdDate: string diff --git a/server/constants/applicationTypes.ts b/server/constants/applicationTypes.ts index 59c50e8..81c3246 100644 --- a/server/constants/applicationTypes.ts +++ b/server/constants/applicationTypes.ts @@ -3,6 +3,6 @@ export const APPLICATION_TYPES = [ { name: 'Swap visiting orders (VOs) for PIN credit', value: 'swap-visiting-orders-for-pin-credit', - apiValue: 'SWAP_VISITING_ORDERS_FOR_PIN_CREDIT', + apiValue: 'PIN_PHONE_CREDIT_TOP_UP', }, ] diff --git a/server/data/managingPrisonerAppsClient.test.ts b/server/data/managingPrisonerAppsClient.test.ts index 5d730d0..6886e12 100644 --- a/server/data/managingPrisonerAppsClient.test.ts +++ b/server/data/managingPrisonerAppsClient.test.ts @@ -22,7 +22,7 @@ describe('Managing Prisoner Apps API Client', () => { it('should fetch a prisoner application by prisoner and application ID', async () => { fakeManagingPrisonerAppApi - .get('/v1/prisoners/prisoner-id/apps/app-id') + .get('/v1/prisoners/prisoner-id/apps/app-id?requestedBy=true') .matchHeader('authorization', `Bearer ${user.token}`) .reply(200, prisonerApp) diff --git a/server/data/managingPrisonerAppsClient.ts b/server/data/managingPrisonerAppsClient.ts index 20e22ac..f1bed57 100644 --- a/server/data/managingPrisonerAppsClient.ts +++ b/server/data/managingPrisonerAppsClient.ts @@ -17,7 +17,7 @@ export default class ManagingPrisonerAppsApiClient { async getPrisonerApp(prisonerId: string, applicationId: string): Promise { try { return await this.restClient.get({ - path: `/v1/prisoners/${prisonerId}/apps/${applicationId}`, + path: `/v1/prisoners/${prisonerId}/apps/${applicationId}?requestedBy=true`, }) } catch (error) { logger.error(`Error fetching application for prisonerId: ${prisonerId}, applicationId: ${applicationId}`, error) diff --git a/server/routes/applications/forwardApplicationRoutes.ts b/server/routes/applications/forwardApplicationRoutes.ts index 04232bd..b3ca8bd 100644 --- a/server/routes/applications/forwardApplicationRoutes.ts +++ b/server/routes/applications/forwardApplicationRoutes.ts @@ -31,7 +31,7 @@ export default function forwardApplicationRoutes({ correlationId: req.id, }) - const applicationType = getApplicationType(application.type) + const applicationType = getApplicationType(application.appType) if (!applicationType) { return res.redirect(`/applications/${departmentName}/pending?error=unknown-type`) @@ -60,7 +60,7 @@ export default function forwardApplicationRoutes({ return res.redirect(`/applications/${departmentName}/pending`) } - const applicationType = getApplicationType(application.type) + const applicationType = getApplicationType(application.appType) const errors = validateForwardingApplication(forwardToDepartment, forwardingReason) if (Object.keys(errors).length > 0) { diff --git a/server/routes/applications/viewApplicationsRoutes.ts b/server/routes/applications/viewApplicationsRoutes.ts index 04f0324..62641dd 100644 --- a/server/routes/applications/viewApplicationsRoutes.ts +++ b/server/routes/applications/viewApplicationsRoutes.ts @@ -42,7 +42,7 @@ export default function viewApplicationRoutes({ correlationId: req.id, }) - const applicationType = getApplicationType(application.type) + const applicationType = getApplicationType(application.appType) if (!applicationType) { return res.redirect(`/applications/${departmentName}/pending?error=unknown-type`) diff --git a/server/routes/testutils/testData.ts b/server/routes/testutils/testData.ts index 7a74222..3c2c51f 100644 --- a/server/routes/testutils/testData.ts +++ b/server/routes/testutils/testData.ts @@ -17,7 +17,7 @@ export default class TestData { type: 'DEPARTMENT', email: 'business+hub+ABC@justice.gov.uk', }, - type: 'SWAP_VISITING_ORDERS_FOR_PIN_CREDIT', + appType: 'SWAP_VISITING_ORDERS_FOR_PIN_CREDIT', requestedBy: { id: 'G123456', firstName: 'Emily', diff --git a/server/views/pages/view-application/swap-visiting-orders-for-pin-credit.njk b/server/views/pages/view-application/swap-visiting-orders-for-pin-credit.njk index 1bbcfd4..adde4d7 100644 --- a/server/views/pages/view-application/swap-visiting-orders-for-pin-credit.njk +++ b/server/views/pages/view-application/swap-visiting-orders-for-pin-credit.njk @@ -39,7 +39,7 @@ text: "Status" }, value: { - text: "" + text: application.status } }, { @@ -52,7 +52,7 @@ actions: { items: [ { - href: "/applications/" + departmentName + "/" + application.requestedBy.id + "/" + application.id + "/forward", + href: "/applications/" + departmentName + "/" + application.requestedBy.username + "/" + application.id + "/forward", text: "Forward", visuallyHiddenText: "department" } @@ -72,7 +72,7 @@ text: "Date sent" }, value: { - text: application.requestedDate + text: application.requestedDateTime } }, { @@ -95,7 +95,7 @@ text: "Prisoner" }, value: { - text: application.requestedBy.id + text: application.requestedBy.username }, actions: { items: [