VB-3521/VB-3557/VB-3559/VB-3558/VB-3560/Change additional support pag…

…e - single text field (#729)
ministryofjustice · Mar 5, 2024 · dcf42c1 · dcf42c1
1 parent a2b21b9
commit dcf42c1
Show file tree

Hide file tree

Showing 44 changed files with 851 additions and 698 deletions.
diff --git a/integration_tests/integration/bookAVisit.cy.ts b/integration_tests/integration/bookAVisit.cy.ts
@@ -151,13 +151,10 @@ context('Book a visit', () => {
     selectVisitDateAndTime.getSlotById(1).check()
 
     // Additional support
-    cy.task('stubAvailableSupport')
     selectVisitDateAndTime.continueButton().click()
     const additionalSupportPage = Page.verifyOnPage(AdditionalSupportPage)
     additionalSupportPage.additionalSupportRequired().check()
-    additionalSupportPage.selectSupportType('WHEELCHAIR')
-    additionalSupportPage.selectSupportType('OTHER')
-    additionalSupportPage.enterOtherSupportDetails('Some extra help!')
+    additionalSupportPage.enterSupportDetails('Wheelchair ramp, Some extra help!')
 
     // Main contact
     additionalSupportPage.continueButton().click()
@@ -195,7 +192,7 @@ context('Book a visit', () => {
           { nomisPersonId: contacts[0].personId, visitContact: true },
           { nomisPersonId: contacts[1].personId, visitContact: false },
         ],
-        visitorSupport: [{ type: 'WHEELCHAIR' }, { type: 'OTHER', text: 'Some extra help!' }],
+        visitorSupport: { description: 'Wheelchair ramp, Some extra help!' },
         sessionTemplateReference: visitSessions[0].sessionTemplateReference,
       }),
     )
@@ -208,7 +205,7 @@ context('Book a visit', () => {
           { nomisPersonId: contacts[0].personId, visitContact: true },
           { nomisPersonId: contacts[1].personId, visitContact: false },
         ],
-        visitorSupport: [{ type: 'WHEELCHAIR' }, { type: 'OTHER', text: 'Some extra help!' }],
+        visitorSupport: { description: 'Wheelchair ramp, Some extra help!' },
       }),
       applicationMethod: 'PHONE',
     })

diff --git a/integration_tests/integration/cancelVisit.cy.ts b/integration_tests/integration/cancelVisit.cy.ts
@@ -39,7 +39,6 @@ context('Cancel visit journey', () => {
     cy.task('stubPrisonerById', prisoner)
     cy.task('stubVisitHistory', visitHistoryDetails)
     cy.task('stubPrisonerSocialContacts', { offenderNo, contacts })
-    cy.task('stubAvailableSupport')
     cy.task('stubGetVisitNotifications', { reference: visitHistoryDetails.visit.reference })
   })
 

diff --git a/integration_tests/integration/checkYourBooking.cy.ts b/integration_tests/integration/checkYourBooking.cy.ts
@@ -95,7 +95,6 @@ context('Check visit details page', () => {
     selectVisitDateAndTime.getSlotById(1).check()
 
     // Additional support
-    cy.task('stubAvailableSupport')
     selectVisitDateAndTime.continueButton().click()
     const additionalSupportPage = Page.verifyOnPage(AdditionalSupportPage)
     additionalSupportPage.additionalSupportNotRequired().check()
@@ -138,7 +137,7 @@ context('Check visit details page', () => {
         endTimestamp: visitSessions[1].endTimestamp,
         visitContact: { name: 'Jeanette Smith', telephone: '01234 567890' },
         visitors: [{ nomisPersonId: contacts[0].personId, visitContact: true }],
-        visitorSupport: [],
+        visitorSupport: { description: '' },
         sessionTemplateReference: visitSessions[1].sessionTemplateReference,
       }),
     )
@@ -166,7 +165,7 @@ context('Check visit details page', () => {
           { nomisPersonId: contacts[0].personId, visitContact: true },
           { nomisPersonId: contacts[1].personId, visitContact: false },
         ],
-        visitorSupport: [],
+        visitorSupport: { description: '' },
         sessionTemplateReference: visitSessions[1].sessionTemplateReference,
       }),
     )
@@ -181,7 +180,7 @@ context('Check visit details page', () => {
     checkYourBookingPage.changeAdditionalSupport().click()
     additionalSupportPage.additionalSupportNotRequired().should('be.checked')
     additionalSupportPage.additionalSupportRequired().check()
-    additionalSupportPage.selectSupportType('WHEELCHAIR')
+    additionalSupportPage.enterSupportDetails('Wheelchair ramp')
     additionalSupportPage.continueButton().click()
     mainContactPage.continueButton().click()
     requestMethodPage.continueButton().click()
@@ -212,7 +211,7 @@ context('Check visit details page', () => {
           { nomisPersonId: contacts[0].personId, visitContact: true },
           { nomisPersonId: contacts[1].personId, visitContact: false },
         ],
-        visitorSupport: [{ type: 'WHEELCHAIR' }],
+        visitorSupport: { description: 'Wheelchair ramp' },
         sessionTemplateReference: visitSessions[1].sessionTemplateReference,
       }),
     )
@@ -226,7 +225,7 @@ context('Check visit details page', () => {
           { nomisPersonId: contacts[0].personId, visitContact: true },
           { nomisPersonId: contacts[1].personId, visitContact: false },
         ],
-        visitorSupport: [{ type: 'WHEELCHAIR' }],
+        visitorSupport: { description: 'Wheelchair ramp' },
       }),
       applicationMethod: 'WEBSITE',
     })

diff --git a/integration_tests/integration/searchForABooking.cy.ts b/integration_tests/integration/searchForABooking.cy.ts
@@ -65,7 +65,6 @@ context('Search for a booking by reference', () => {
 
     cy.task('stubVisitHistory', TestData.visitHistoryDetails({ visit }))
     cy.task('stubPrisonerSocialContacts', { offenderNo, contacts })
-    cy.task('stubAvailableSupport')
     cy.task('stubGetVisitNotifications', { reference: visit.reference })
 
     searchBookingByReferenceResultsPage.visitReferenceLink().click()
@@ -139,7 +138,6 @@ context('Search for a booking by reference', () => {
     upcomingVisitsPage.visitStatus().contains('Booked')
 
     cy.task('stubPrisonerSocialContacts', { offenderNo, contacts })
-    cy.task('stubAvailableSupport')
     cy.task('stubVisitHistory', TestData.visitHistoryDetails({ visit: upcomingVisit }))
     cy.task('stubGetVisitNotifications', { reference: upcomingVisit.reference })
 

diff --git a/integration_tests/integration/updateAVisit.cy.ts b/integration_tests/integration/updateAVisit.cy.ts
@@ -49,7 +49,7 @@ context('Update a visit', () => {
       startTimestamp: visitSessions[0].startTimestamp,
       endTimestamp: visitSessions[0].endTimestamp,
       visitors: [{ nomisPersonId: 4321, visitContact: true }],
-      visitorSupport: [],
+      visitorSupport: { description: '' },
     })
     const visitHistoryDetails = TestData.visitHistoryDetails({ visit: originalVisit })
 
@@ -68,7 +68,6 @@ context('Update a visit', () => {
     cy.task('stubPrisonerById', prisoner)
     cy.task('stubVisitHistory', visitHistoryDetails)
     cy.task('stubPrisonerSocialContacts', { offenderNo, contacts })
-    cy.task('stubAvailableSupport')
     cy.task('stubGetVisitNotifications', { reference: visitHistoryDetails.visit.reference })
 
     // Visit details page
@@ -112,7 +111,7 @@ context('Update a visit', () => {
         { nomisPersonId: 4321, visitContact: true },
         { nomisPersonId: 4322, visitContact: false },
       ],
-      visitorSupport: [],
+      visitorSupport: { description: '' },
     })
     cy.task('stubCreateVisitApplicationFromVisit', {
       visitReference: visitHistoryDetails.visit.reference,
@@ -126,9 +125,7 @@ context('Update a visit', () => {
     additionalSupportPage.additionalSupportNotRequired().should('be.checked')
     additionalSupportPage.additionalSupportRequired().should('not.be.checked')
     additionalSupportPage.additionalSupportRequired().check()
-    additionalSupportPage.selectSupportType('WHEELCHAIR')
-    additionalSupportPage.selectSupportType('OTHER')
-    additionalSupportPage.enterOtherSupportDetails('Some extra help!')
+    additionalSupportPage.enterSupportDetails('Wheelchair ramp, Some extra help!')
     additionalSupportPage.continueButton().click()
 
     // Main contact - check pre-populated then change phone number
@@ -167,7 +164,7 @@ context('Update a visit', () => {
           { nomisPersonId: contacts[0].personId, visitContact: true },
           { nomisPersonId: contacts[1].personId, visitContact: false },
         ],
-        visitorSupport: [{ type: 'WHEELCHAIR' }, { type: 'OTHER', text: 'Some extra help!' }],
+        visitorSupport: { description: 'Wheelchair ramp, Some extra help!' },
         sessionTemplateReference: visitSessions[1].sessionTemplateReference,
       }),
     )
@@ -180,7 +177,7 @@ context('Update a visit', () => {
           { nomisPersonId: contacts[0].personId, visitContact: true },
           { nomisPersonId: contacts[1].personId, visitContact: false },
         ],
-        visitorSupport: [{ type: 'WHEELCHAIR' }, { type: 'OTHER', text: 'Some extra help!' }],
+        visitorSupport: { description: 'Wheelchair ramp, Some extra help!' },
       }),
       applicationMethod: 'PHONE',
     })
@@ -217,7 +214,7 @@ context('Update a visit', () => {
       startTimestamp: visitSessions[0].startTimestamp,
       endTimestamp: visitSessions[0].endTimestamp,
       visitors: [{ nomisPersonId: 4321, visitContact: true }],
-      visitorSupport: [],
+      visitorSupport: { description: '' },
     })
     const visitHistoryDetails = TestData.visitHistoryDetails({ visit: originalVisit })
 
@@ -236,7 +233,6 @@ context('Update a visit', () => {
     cy.task('stubPrisonerById', prisoner)
     cy.task('stubVisitHistory', visitHistoryDetails)
     cy.task('stubPrisonerSocialContacts', { offenderNo, contacts })
-    cy.task('stubAvailableSupport')
     cy.task('stubGetVisitNotifications', { reference: visitHistoryDetails.visit.reference })
 
     // Visit details page

diff --git a/integration_tests/integration/visitDetails.cy.ts b/integration_tests/integration/visitDetails.cy.ts
@@ -47,7 +47,6 @@ context('Visit details page', () => {
     cy.task('stubPrisonerById', prisoner)
     cy.task('stubVisitHistory', visitHistoryDetails)
     cy.task('stubPrisonerSocialContacts', { offenderNo, contacts })
-    cy.task('stubAvailableSupport')
     cy.visit('/visit/ab-cd-ef-gh')
     const visitDetailsPage = Page.verifyOnPage(VisitDetailsPage)
 
@@ -102,7 +101,6 @@ context('Visit details page', () => {
     cy.task('stubPrisonerById', prisoner)
     cy.task('stubVisitHistory', visitHistoryDetails)
     cy.task('stubPrisonerSocialContacts', { offenderNo, contacts })
-    cy.task('stubAvailableSupport')
     cy.task('stubGetVisitNotifications', { reference: TestData.visit().reference, notifications })
     cy.visit('/visit/ab-cd-ef-gh')
 
@@ -150,7 +148,6 @@ context('Visit details page', () => {
     cy.task('stubPrisonerById', prisoner)
     cy.task('stubVisitHistory', visitHistoryDetails)
     cy.task('stubPrisonerSocialContacts', { offenderNo, contacts })
-    cy.task('stubAvailableSupport')
     cy.visit('/visit/ab-cd-ef-gh')
 
     const visitDetailsPage = Page.verifyOnPage(VisitDetailsPage)
@@ -170,7 +167,9 @@ context('Visit details page', () => {
     visitDetailsPage.visitorDob2().contains(format(new Date(childDob), longDateFormat))
     visitDetailsPage.visitorAddress2().contains('C1 2AB')
     visitDetailsPage.visitorRestrictions2().contains('None')
-    visitDetailsPage.additionalSupport().contains('Wheelchair ramp, custom request')
+    visitDetailsPage
+      .additionalSupport()
+      .contains('Wheelchair ramp, Portable induction loop for people with hearing aids')
 
     // Select history tab
     visitDetailsPage.selectHistoryTab()

diff --git a/integration_tests/mockApis/orchestration.ts b/integration_tests/mockApis/orchestration.ts
@@ -232,19 +232,6 @@ export default {
       },
     })
   },
-  stubAvailableSupport: (): SuperAgentRequest => {
-    return stubFor({
-      request: {
-        method: 'GET',
-        url: '/orchestration/visit-support',
-      },
-      response: {
-        status: 200,
-        headers: { 'Content-Type': 'application/json;charset=UTF-8' },
-        jsonBody: TestData.supportTypes(),
-      },
-    })
-  },
   stubGetNotificationCount: ({
     prisonId = 'HEI',
     notificationCount = TestData.notificationCount(),

diff --git a/integration_tests/pages/additionalSupport.ts b/integration_tests/pages/additionalSupport.ts
@@ -13,12 +13,8 @@ export default class AdditionalSupportPage extends Page {
 
   additionalSupportNotRequired = (): PageElement => cy.get('[data-test=support-required-no]')
 
-  enterOtherSupportDetails = (details: string): void => {
-    cy.get('#otherSupportDetails').type(details)
-  }
-
-  selectSupportType = (type: string): void => {
-    cy.get(`[data-test=${type}]`).check()
+  enterSupportDetails = (details: string): void => {
+    cy.get('#additionalSupport').type(details)
   }
 
   continueButton = (): PageElement => cy.get('[data-test=submit]')

diff --git a/server/@types/bapv.d.ts b/server/@types/bapv.d.ts
@@ -107,7 +107,7 @@ export type VisitSessionData = {
   originalVisitSlot?: VisitSlot
   visitRestriction?: 'OPEN' | 'CLOSED'
   visitors?: VisitorListItem[]
-  visitorSupport?: VisitorSupport[]
+  visitorSupport?: VisitorSupport
   mainContact?: {
     contact?: VisitorListItem
     phoneNumber: string

diff --git a/server/@types/express/index.d.ts b/server/@types/express/index.d.ts
@@ -1,4 +1,3 @@
-import { SupportType } from '../../data/orchestrationApiTypes'
 import { VisitorListItem, VisitSessionData, Prison } from '../bapv'
 import { UserDetails } from '../../services/userService'
 
@@ -9,7 +8,6 @@ declare module 'express-session' {
   interface SessionData {
     returnTo: string
     nowInMinutes: number
-    availableSupportTypes: SupportType[]
     visitorList: { visitors: VisitorListItem[] }
     adultVisitors: { adults: VisitorListItem[] }
     slotsList: VisitSlotList