Merge pull request #669 from ministryofjustice/revert-663-feature/134…

…8-show-submitted-referrals

Revert "Show submitted referrals"

cypress_shared/pages/apply/index.ts

@@ -44,7 +44,6 @@ import SelectOffencePage from './selectOffence'
 import StartPage from './startPage'
 import SubmissionConfirmation from './submissionConfirmation'
 import TaskListPage from './taskListPage'
-import ApplicationFullPage from './full'
 
 export {
   AccommodationRequiredFromDatePage,
@@ -93,5 +92,4 @@ export {
   SubstanceMisusePage,
   SupportInTheCommunityPage,
   TaskListPage,
-  ApplicationFullPage,
 }

cypress_shared/pages/apply/list.ts

@@ -5,17 +5,14 @@ import { isFullPerson, personName } from '../../../server/utils/personUtils'
 import Page from '../page'
 
 export default class ListPage extends Page {
-  constructor(
-    private readonly inProgressApplications: Array<Application>,
-    private readonly submittedApplications: Array<Application>,
-  ) {
+  constructor(private readonly inProgressApplications: Array<Application>) {
     super('Transitional Accommodation (CAS3) referrals')
   }
 
-  static visit(inProgressApplications: Array<Application>, submittedApplications: Array<Application>): ListPage {
+  static visit(inProgressApplications: Array<Application>): ListPage {
     cy.visit(paths.applications.index.pattern)
 
-    return new ListPage(inProgressApplications, submittedApplications)
+    return new ListPage(inProgressApplications)
   }
 
   clickApplication(application: Application) {
@@ -30,47 +27,35 @@ export default class ListPage extends Page {
     this.shouldShowApplications(this.inProgressApplications, 'in-progress', 'In Progress')
   }
 
-  shouldShowSubmittedApplications(): void {
-    this.shouldShowApplications(this.submittedApplications, 'applications-submitted', 'Submitted')
-  }
-
-  shouldShowSubmittedApplication(application: Application): void {
-    this.shouldShowApplication(application, 'applications-submitted', 'Submitted')
-  }
-
   clickSubmit() {
     cy.get('.govuk-button').click()
   }
 
-  clickSubmittedTab() {
-    cy.get('a').contains('Submitted').click()
-  }
-
-  private shouldShowApplication(application: Application, containerId: string, status: string): void {
-    cy.get(`#${containerId}`).within(() => {
-      cy.get(`a[href*="${paths.applications.show({ id: application.id })}"]`)
-        .parent()
-        .parent()
-        .within(() => {
-          cy.get('th').eq(0).contains(personName(application.person, 'Limited access offender'))
-          cy.get('td').eq(0).contains(application.person.crn)
-          cy.get('td')
-            .eq(1)
-            .contains(
-              application.submittedAt
-                ? DateFormats.isoDateToUIDate(application.submittedAt, {
-                    format: 'short',
-                  })
-                : 'N/A',
-            )
-          cy.get('td').eq(2).contains(status)
-        })
-    })
-  }
-
   private shouldShowApplications(applications: Array<Application>, containerId: string, status: string): void {
     cy.get(`#${containerId}`).find('tbody>tr').should('have.length', applications.length)
 
-    applications.forEach(application => this.shouldShowApplication(application, containerId, status))
+    applications.forEach(application => {
+      const releaseDate = application.data['basic-information']?.['release-date']?.releaseDate
+
+      cy.get(`#${containerId}`).within(() => {
+        cy.get(`a[href*="${paths.applications.show({ id: application.id })}"]`)
+          .parent()
+          .parent()
+          .within(() => {
+            cy.get('th').eq(0).contains(personName(application.person, 'Limited access offender'))
+            cy.get('td').eq(0).contains(application.person.crn)
+            cy.get('td')
+              .eq(1)
+              .contains(
+                releaseDate
+                  ? DateFormats.isoDateToUIDate(releaseDate, {
+                      format: 'short',
+                    })
+                  : 'N/A',
+              )
+            cy.get('td').eq(2).contains(status)
+          })
+      })
+    })
   }
 }

e2e/tests/apply-and-place.feature

@@ -3,8 +3,7 @@ Feature: Apply for and book a Temporary Accommodation bedspace
     Given I am logged in as a referrer
     When I start a new application
     And I fill in and complete an application
-    And I see a confirmation of the application
-    Then I can see the full submitted application
+    Then I should see a confirmation of the application
   Scenario: Booking a bedspace from an assessment
     Given I am logged in as an assessor
     When I view an existing active premises

e2e/tests/stepDefinitions/apply.ts

@@ -1,8 +1,6 @@
 import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 import ApplyHelper from '../../../cypress_shared/helpers/apply'
-import ListPage from '../../../cypress_shared/pages/apply/list'
-import ApplicationFullPage from '../../../cypress_shared/pages/apply/full'
 import SelectOffencePage from '../../../cypress_shared/pages/apply/selectOffence'
 import SubmissionConfirmation from '../../../cypress_shared/pages/apply/submissionConfirmation'
 import Page from '../../../cypress_shared/pages/page'
@@ -50,22 +48,8 @@ Given('I fill in and complete an application', () => {
   })
 })
 
-Given('I see a confirmation of the application', () => {
+Then('I should see a confirmation of the application', () => {
   const confirmationPage = Page.verifyOnPage(SubmissionConfirmation)
 
   confirmationPage.clickBackToDashboard()
 })
-
-Then('I can see the full submitted application', () => {
-  cy.url().then(function _() {
-    const listPage = Page.verifyOnPage(ListPage, [], [])
-
-    listPage.clickSubmittedTab()
-
-    listPage.shouldShowSubmittedApplication(this.application)
-
-    listPage.clickApplication(this.application)
-
-    Page.verifyOnPage(ApplicationFullPage, this.application)
-  })
-})

integration_tests/tests/apply/apply.cy.ts

@@ -1,5 +1,4 @@
 import {
-  ApplicationFullPage,
   EnterCRNPage,
   ListPage,
   MoveOnPlanPage,
@@ -188,7 +187,7 @@ context('Apply', () => {
     confirmationPage.clickBackToDashboard()
 
     // Then I am taken back to the dashboard
-    Page.verifyOnPage(ListPage, applications, [])
+    Page.verifyOnPage(ListPage, applications)
   })
 
   it('shows an error if the application is submitted without checking the confirm checkbox', function test() {
@@ -199,7 +198,7 @@ context('Apply', () => {
     apply.setupApplicationStubs()
 
     // When I visit the application listing page
-    const listPage = ListPage.visit([this.application], [])
+    const listPage = ListPage.visit([this.application])
 
     // And I click on the application
     listPage.clickApplication(this.application)
@@ -221,7 +220,7 @@ context('Apply', () => {
     apply.setupApplicationStubs()
 
     // When I visit the application listing page
-    const listPage = ListPage.visit([application], [])
+    const listPage = ListPage.visit([application])
 
     // And I click on the application
     listPage.clickApplication(application)
@@ -239,7 +238,7 @@ context('Apply', () => {
     apply.setupApplicationStubs()
 
     // When I visit the application listing page
-    const listPage = ListPage.visit([this.application], [])
+    const listPage = ListPage.visit([this.application])
 
     // And I click on the application
     listPage.clickApplication(this.application)
@@ -278,7 +277,7 @@ context('Apply', () => {
     apply.setupApplicationStubs()
 
     // When I visit the application listing page
-    const listPage = ListPage.visit([this.application], [])
+    const listPage = ListPage.visit([this.application])
 
     // And I click on the application
     listPage.clickApplication(this.application)
@@ -297,25 +296,4 @@ context('Apply', () => {
     // Then I check your answers should be marked as completed
     taskListPage.shouldShowTaskStatus('check-your-answers', 'Completed')
   })
-
-  it('shows the full submitted application', function test() {
-    // Given there is a complete and submitted application
-    const application = { ...this.application, status: 'submitted' }
-
-    cy.task('stubApplications', [application])
-    cy.task('stubApplicationGet', { application })
-
-    // When I visit the application listing page
-    const listPage = ListPage.visit([], [application])
-
-    // And I click on the submitted tab
-    listPage.clickSubmittedTab()
-
-    // And I click on an application
-    listPage.clickApplication(application)
-
-    // Then I should see the full application
-    const applicationFullPage = Page.verifyOnPage(ApplicationFullPage, application)
-    applicationFullPage.shouldShowApplication(application.document)
-  })
 })

integration_tests/tests/apply/list.cy.ts

@@ -21,17 +21,11 @@ context('Applications dashboard', () => {
     cy.signIn()
 
     // When I visit the Previous Applications page
-    const page = ListPage.visit(inProgressApplications, submittedApplications)
+    const page = ListPage.visit(inProgressApplications)
 
     // Then I should see all of the in progress applications
     page.shouldShowInProgressApplications()
 
-    // And I click on the submitted tab
-    page.clickSubmittedTab()
-
-    // Then I should see the applications that have been submitted
-    page.shouldShowSubmittedApplications()
-
     // And I the button should take me to the application start page
     page.clickSubmit()
 

integration_tests/tests/apply/show.cy.ts

@@ -28,6 +28,6 @@ context('Application Page', () => {
     page.clickBack()
 
     // Then I navigate to the list application page
-    Page.verifyOnPage(ListPage, inProgressApplications, [])
+    Page.verifyOnPage(ListPage, inProgressApplications)
   })
 })

integration_tests/tests/landing.cy.ts

@@ -27,7 +27,7 @@ context('Landing', () => {
     cy.signIn()
 
     // I am redirected to the application listing page
-    Page.verifyOnPage(ListPage, [], [])
+    Page.verifyOnPage(ListPage, [])
   })
 
   it('redirects a user who is not an assessor or a referrer', () => {

server/controllers/apply/applicationsController.test.ts

@@ -348,19 +348,4 @@ describe('applicationsController', () => {
       expect(response.render).toHaveBeenCalledWith('applications/confirm')
     })
   })
-
-  describe('full', () => {
-    it('renders the full application page for submitted referrals', async () => {
-      const application = createMock<TemporaryAccommodationApplication>()
-
-      request = createMock<Request>({
-        params: { id: application.id },
-      })
-
-      const requestHandler = applicationsController.full()
-      await requestHandler(request, response, next)
-
-      expect(response.render).toHaveBeenCalledWith('applications/full', application)
-    })
-  })
 })

server/controllers/apply/applicationsController.ts

@@ -135,17 +135,4 @@ export default class ApplicationsController {
       return res.render('applications/confirm')
     }
   }
-
-  full(): RequestHandler {
-    return async (req: Request, res: Response) => {
-      const callConfig = extractCallConfig(req)
-
-      const { id } = req.params
-      const application = await this.applicationService.findApplication(callConfig, id)
-
-      return res.render('applications/full', {
-        application,
-      })
-    }
-  }
 }

server/paths/apply.ts

@@ -20,7 +20,6 @@ const paths = {
     index: applicationsPath,
     show: applicationPath,
     update: applicationPath,
-    full: applicationPath.path('full'),
     checkYourAnswers: applicationPath.path('check-your-answers'),
     submission: applicationPath.path('submission'),
     confirm: applicationPath.path('confirm'),

server/routes/apply.ts

@@ -21,7 +21,6 @@ export default function routes(controllers: Controllers, services: Services, rou
   get(paths.applications.index.pattern, applicationsController.index(), { auditEvent: 'VIEW_APPLICATIONS_LIST' })
   get(paths.applications.new.pattern, applicationsController.new(), { auditEvent: 'VIEW_APPLICATION_NEW' })
   get(paths.applications.show.pattern, applicationsController.show(), { auditEvent: 'VIEW_APPLICATION' })
-  get(paths.applications.full.pattern, applicationsController.full(), { auditEvent: 'VIEW_FULL_APPLICATION' })
   get(paths.applications.confirm.pattern, applicationsController.confirm(), {
     auditEvent: 'VIEW_APPLICATION_CONFIRM',
   })

server/services/applicationService.test.ts

@@ -71,7 +71,6 @@ describe('ApplicationService', () => {
 
       expect(result).toEqual({
         inProgress: inProgressApplications,
-        submitted: submittedApplications,
       })
 
       expect(applicationClientFactory).toHaveBeenCalledWith(callConfig)

server/services/applicationService.ts

@@ -35,7 +35,6 @@ export default class ApplicationService {
     const allApplications = await applicationClient.all()
     const result = {
       inProgress: [],
-      submitted: [],
     } as GroupedApplications
 
     await Promise.all(
@@ -44,9 +43,6 @@ export default class ApplicationService {
           case 'inProgress':
             result.inProgress.push(application)
             break
-          case 'submitted':
-            result.submitted.push(application)
-            break
           default:
             break
         }