CDPS-716 add no cell prisoners page

helm_deploy/values-dev.yaml

@@ -69,6 +69,7 @@ generic-service:
     WELCOME_PEOPLE_INTO_PRISON_URL: https://welcome-dev.prison.service.justice.gov.uk
     ACCREDITED_PROGRAMMES_URL: https://accredited-programmes-dev.hmpps.service.justice.gov.uk
     PRISONER_PROFILE_URL: https://prisoner-dev.digital.prison.service.justice.gov.uk
+    CHANGE_SOMEONES_CELL_URL: https://change-someones-cell-dev.prison.service.justice.gov.uk
 
 
     # Feature flags

helm_deploy/values-preprod.yaml

@@ -68,6 +68,7 @@ generic-service:
     WELCOME_PEOPLE_INTO_PRISON_URL: https://welcome-preprod.prison.service.justice.gov.uk
     ACCREDITED_PROGRAMMES_URL: https://accredited-programmes-preprod.hmpps.service.justice.gov.uk
     PRISONER_PROFILE_URL: https://prisoner-preprod.digital.prison.service.justice.gov.uk
+    CHANGE_SOMEONES_CELL_URL: https://change-someones-cell-preprod.prison.service.justice.gov.uk
 
     # Feature flags
     USE_OF_FORCE_PRISONS: "ACI,AGI,ASI,AYI,BAI,BCI,BFI,BHI,BLI,BMI,BNI,BRI,BSI,BWI,BXI,BZI,CDI,CFI,CLI,CWI,DAI,DGI,DHI,DMI,DNI,DTI,DWI,EEI,EHI,ESI,EWI,EXI,EYI,FBI,FDI,FEI,FHI,FKI,FMI,FNI,FSI,FWI,GHI,GMI,GNI,GTI,HBI,HCI,HDI,HEI,HHI,HII,HLI,HMI,HOI,HPI,HVI,ISI,IWI,KMI,KVI,LCI,LEI,LFI,LGI,LHI,LII,LLI,LNI,LPI,LTI,LWI,LYI,MDI,MHI,MRI,MSI,MTI,NHI,NLI,NMI,NSI,NWI,ONI,OWI,PBI,PDI,PFI,PNI,PRI,PVI,RCI,RHI,RNI,RSI,SDI,SFI,SHI,SKI,SLI,SNI,SPI,STI,SUI,SWI,TCI,TSI,UKI,UPI,VEI,WCI,WDI,WEI,WHI,WII,WLI,WMI,WRI,WSI,WTI,WWI"

helm_deploy/values-prod.yaml

@@ -72,6 +72,7 @@ generic-service:
     WELCOME_PEOPLE_INTO_PRISON_URL: https://welcome.prison.service.justice.gov.uk
     ACCREDITED_PROGRAMMES_URL: https://accredited-programmes.hmpps.service.justice.gov.uk
     PRISONER_PROFILE_URL: https://prisoner.digital.prison.service.justice.gov.uk
+    CHANGE_SOMEONES_CELL_URL: https://change-someones-cell.prison.service.justice.gov.uk
 
     # Feature flags
     ACTIVITIES_ENABLED_PRISONS: "RSI,LPI"

integration_tests/e2e/noCellAllocated.cy.ts

@@ -0,0 +1,58 @@
+import Page from '../pages/page'
+import { Role } from '../../server/enums/role'
+import NoCellAllocatedPage from '../pages/NoCellAllocated'
+import { prisonerSearchMock } from '../../server/test/mocks/prisonerSearchMock'
+
+function visitPageWithRoles(roles: string[]) {
+  cy.setupUserAuth({
+    roles,
+    caseLoads: [
+      { caseloadFunction: '', caseLoadId: 'MDI', currentlyActive: true, description: 'Leeds (HMP)', type: '' },
+    ],
+  })
+  cy.signIn({ redirectPath: '/establishment-roll/no-cell-allocated' })
+  cy.visit('/establishment-roll/no-cell-allocated')
+}
+context('In reception Page', () => {
+  beforeEach(() => {
+    cy.task('reset')
+    cy.task('stubPostAttributeSearch')
+    cy.task('stubGetOffenderCellHistory', prisonerSearchMock[0].bookingId)
+    cy.task('stubGetOffenderCellHistory', prisonerSearchMock[1].bookingId)
+    cy.task('getUserDetailsList')
+  })
+
+  it('Page is visible', () => {
+    visitPageWithRoles([`ROLE_PRISON`, `ROLE_${Role.GlobalSearch}`])
+
+    Page.verifyOnPage(NoCellAllocatedPage)
+  })
+
+  it('should display a table row for each wing level assignedRollCount', () => {
+    visitPageWithRoles([`ROLE_PRISON`, `ROLE_${Role.GlobalSearch}`])
+
+    const page = Page.verifyOnPage(NoCellAllocatedPage)
+    page.inReceptionRows().should('have.length', 2)
+
+    page.inReceptionRows().first().find('td').eq(1).should('contain.text', 'Shannon, Eddie')
+    page.inReceptionRows().first().find('td').eq(2).should('contain.text', 'A1234AB')
+    page.inReceptionRows().first().find('td').eq(3).should('contain.text', '1-1-2')
+    page.inReceptionRows().first().find('td').eq(4).should('contain.text', '00:00')
+    page.inReceptionRows().first().find('td').eq(5).should('contain.text', 'Edwin Shannon')
+  })
+
+  it('should display allocation link if user has cell move', () => {
+    visitPageWithRoles([`ROLE_PRISON`, `ROLE_${Role.GlobalSearch}`, `ROLE_${Role.CellMove}`])
+
+    const page = Page.verifyOnPage(NoCellAllocatedPage)
+    page.inReceptionRows().should('have.length', 2)
+
+    page
+      .inReceptionRows()
+      .first()
+      .find('td')
+      .eq(6)
+      .find('a[href="http://localhost:3002/prisoner/A1234AB/cell-move/search-for-cell"]')
+      .should('contain.text', 'Allocate cell')
+  })
+})

integration_tests/mockApis/prison.ts

@@ -10,6 +10,9 @@ import { movementsOutMock } from '../../server/test/mocks/movementsOutMock'
 import { movementsEnRouteMock } from '../../server/test/mocks/movementsEnRouteMock'
 import { movementsInReceptionMock } from '../../server/test/mocks/movementsInReceptionMock'
 import { movementsRecentMock } from '../../server/test/mocks/movementsRecentMock'
+import { offenderCellHistoryMock } from '../../server/test/mocks/offenderCellHistoryMock'
+import { userDetailsMock } from '../../server/test/mocks/userDetailsMock'
+import { pagedListMock } from '../../server/test/mocks/pagedListMock'
 
 export default {
   stubUserCaseLoads: (caseLoads: CaseLoad[] = []) => {
@@ -269,4 +272,36 @@ export default {
       },
     })
   },
+
+  stubGetOffenderCellHistory: (bookingId = 123) => {
+    return stubFor({
+      request: {
+        method: 'GET',
+        url: `/prison/api/bookings/${bookingId}/cell-history?page=0&size=2000`,
+      },
+      response: {
+        status: 200,
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        jsonBody: pagedListMock(offenderCellHistoryMock),
+      },
+    })
+  },
+
+  getUserDetailsList: () => {
+    return stubFor({
+      request: {
+        method: 'POST',
+        url: '/prison/api/users/list',
+      },
+      response: {
+        status: 200,
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        jsonBody: userDetailsMock,
+      },
+    })
+  },
 }

integration_tests/mockApis/prisonerSearch.ts

@@ -1,12 +1,13 @@
 import { stubFor } from './wiremock'
 import { prisonerSearchMock } from '../../server/test/mocks/prisonerSearchMock'
+import { pagedListMock } from '../../server/test/mocks/pagedListMock'
 
 export default {
   stubPostSearchPrisonersById: () => {
     return stubFor({
       request: {
         method: 'POST',
-        urlPattern: '/prisoner-search/prisoner-search/prisoner-numbers',
+        url: '/prisoner-search/prisoner-search/prisoner-numbers',
       },
       response: {
         status: 200,
@@ -17,4 +18,20 @@ export default {
       },
     })
   },
+
+  stubPostAttributeSearch: () => {
+    return stubFor({
+      request: {
+        method: 'POST',
+        url: '/prisoner-search/attribute-search?size=2000',
+      },
+      response: {
+        status: 200,
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        jsonBody: pagedListMock(prisonerSearchMock),
+      },
+    })
+  },
 }

integration_tests/pages/NoCellAllocated.ts

@@ -0,0 +1,9 @@
+import Page, { PageElement } from './page'
+
+export default class NoCellAllocatedPage extends Page {
+  constructor() {
+    super('No cell allocated')
+  }
+
+  inReceptionRows = (): PageElement => cy.get('table.unallocated-roll__table tbody tr')
+}

integration_tests/support/commands.ts

@@ -22,6 +22,5 @@ Cypress.Commands.add(
     cy.task('stubSignIn', options)
     cy.task('stubUserCaseLoads', options.caseLoads)
     cy.task('stubUserLocations', options.locations)
-    cy.task('stubGetStaffRoles')
   },
 )

server/config.ts

@@ -235,6 +235,7 @@ export default {
   serviceUrls: {
     digitalPrisons: get('DIGITAL_PRISONS_URL', 'http://localhost:3001', requiredInProduction),
     prisonerProfile: get('PRISONER_PROFILE_URL', 'http://localhost:3002', requiredInProduction),
+    changeSomeonesCell: get('CHANGE_SOMEONES_CELL_URL', 'http://localhost:3002', requiredInProduction),
   },
   domain: get('INGRESS_URL', 'http://localhost:3000', requiredInProduction),
   todayCacheTTL: Number(get('TODAY_CACHE_TTL', 0, requiredInProduction)),

server/controllers/establishmentRollController.ts

@@ -1,6 +1,8 @@
 import { Request, RequestHandler, Response } from 'express'
 import EstablishmentRollService from '../services/establishmentRollService'
 import MovementsService from '../services/movementsService'
+import { userHasRoles } from '../utils/utils'
+import { Role } from '../enums/role'
 
 export default class EstablishmentRollController {
   constructor(
@@ -82,4 +84,21 @@ export default class EstablishmentRollController {
       res.render('pages/inReception', { prisoners: prisonersEnRoute, prison: user.activeCaseLoad.description })
     }
   }
+
+  public getUnallocated(): RequestHandler {
+    return async (req: Request, res: Response) => {
+      const { user } = res.locals
+      const { clientToken } = req.middleware
+
+      const unallocatedPrisoners = await this.movementsService.getNoCellAllocatedPrisoners(
+        clientToken,
+        user.activeCaseLoadId,
+      )
+
+      res.render('pages/noCellAllocated', {
+        prisoners: unallocatedPrisoners,
+        userCanAllocateCell: userHasRoles([Role.CellMove], user.userRoles),
+      })
+    }
+  }
 }

server/data/interfaces/bedAssignment.ts

@@ -0,0 +1,13 @@
+export interface BedAssignment {
+  bookingId: number
+  livingUnitId: number
+  assignmentDate: string
+  assignmentReason: string
+  assignmentEndDate: string
+  assignmentEndDateTime: string
+  agencyId: string
+  description: string
+  bedAssignmentHistorySequence: number
+  movementMadeBy: string
+  offenderNo: string
+}

server/data/interfaces/pagedList.ts

@@ -0,0 +1,28 @@
+export interface PagedList<T> {
+  content: T[]
+  pageable?: {
+    sort: {
+      empty: boolean
+      sorted: boolean
+      unsorted: boolean
+    }
+    offset: number
+    pageSize: number
+    pageNumber: number
+    paged: boolean
+    unpaged: boolean
+  }
+  totalPages: number
+  last: boolean
+  totalElements: number
+  size: number
+  number: number
+  sort: {
+    empty: boolean
+    sorted: boolean
+    unsorted: boolean
+  }
+  first: boolean
+  numberOfElements: number
+  empty: boolean
+}

server/data/interfaces/prisonApiClient.ts

@@ -9,6 +9,9 @@ import { OffenderIn } from './offenderIn'
 import { OffenderOut } from './offenderOut'
 import { OffenderMovement } from './offenderMovement'
 import { OffenderInReception } from './offenderInReception'
+import { PagedList } from './pagedList'
+import { BedAssignment } from './bedAssignment'
+import { UserDetail } from './userDetail'
 
 export interface PrisonApiClient {
   getUserCaseLoads(): Promise<CaseLoad[]>
@@ -30,4 +33,6 @@ export interface PrisonApiClient {
   getStaffRoles(staffId: number, agencyId: string): Promise<StaffRole[]>
   setActiveCaseload(caseLoad: CaseLoad): Promise<Record<string, string>>
   getPrisonerImage(offenderNumber: string, fullSizeImage: boolean): Promise<Readable>
+  getOffenderCellHistory(bookingId: number, params?: { page: number; size: number }): Promise<PagedList<BedAssignment>>
+  getUserDetailsList(usernames: string[]): Promise<UserDetail[]>
 }

server/data/interfaces/prisonerSearchClient.ts

@@ -1,5 +1,7 @@
 import { Prisoner } from './prisoner'
+import { PagedList } from './pagedList'
 
 export interface PrisonerSearchClient {
   getPrisonersById(prisonerNumbers: string[]): Promise<Prisoner[]>
+  getCswapPrisonersInEstablishment(prisonId: string): Promise<PagedList<Prisoner>>
 }

server/data/interfaces/userDetail.ts

@@ -0,0 +1,14 @@
+export interface UserDetail {
+  staffId: number
+  username: string
+  firstName: string
+  lastName: string
+  thumbnailId?: number
+  activeCaseLoadId?: string
+  accountStatus: 'ACTIVE' | 'INACT' | 'SUS' | 'CAREER' | 'MAT' | 'SAB' | 'SICK'
+  lockDate: string
+  expiryDate?: string
+  lockedFlag?: boolean
+  expiredFlag?: boolean
+  active: boolean
+}

server/data/prisonApiClient.ts

@@ -12,6 +12,9 @@ import { OffenderIn } from './interfaces/offenderIn'
 import { OffenderOut } from './interfaces/offenderOut'
 import { OffenderMovement } from './interfaces/offenderMovement'
 import { OffenderInReception } from './interfaces/offenderInReception'
+import { UserDetail } from './interfaces/userDetail'
+import { BedAssignment } from './interfaces/bedAssignment'
+import { PagedList } from './interfaces/pagedList'
 
 export default class PrisonApiRestClient implements PrisonApiClient {
   constructor(private restClient: RestClient) {}
@@ -102,9 +105,23 @@ export default class PrisonApiRestClient implements PrisonApiClient {
     return this.put<Record<string, string>>({ path: '/api/users/me/activeCaseLoad', data: caseLoad })
   }
 
-  async getPrisonerImage(prisonerNumber: string, fullSizeImage: boolean): Promise<Readable> {
+  getPrisonerImage(prisonerNumber: string, fullSizeImage: boolean): Promise<Readable> {
     return this.restClient.stream({
       path: `/api/bookings/offenderNo/${prisonerNumber}/image/data?fullSizeImage=${fullSizeImage}`,
     })
   }
+
+  getOffenderCellHistory(
+    bookingId: number,
+    pagedParams: { page: number; size: number } = { page: 0, size: 2000 },
+  ): Promise<PagedList<BedAssignment>> {
+    return this.get<PagedList<BedAssignment>>({
+      path: `/api/bookings/${bookingId}/cell-history`,
+      query: querystring.stringify(pagedParams),
+    })
+  }
+
+  getUserDetailsList(usernames: string[]): Promise<UserDetail[]> {
+    return this.post<UserDetail[]>({ path: '/api/users/list', data: usernames })
+  }
 }

server/data/prisonerSearchClient.ts

@@ -1,6 +1,7 @@
 import RestClient from './restClient'
 import { Prisoner } from './interfaces/prisoner'
 import { PrisonerSearchClient } from './interfaces/prisonerSearchClient'
+import { PagedList } from './interfaces/pagedList'
 
 export default class PrisonerSearchRestClient implements PrisonerSearchClient {
   constructor(private restClient: RestClient) {}
@@ -11,4 +12,33 @@ export default class PrisonerSearchRestClient implements PrisonerSearchClient {
       data: { prisonerNumbers },
     })
   }
+
+  async getCswapPrisonersInEstablishment(prisonId: string): Promise<PagedList<Prisoner>> {
+    const attributeRequest = {
+      joinType: 'AND',
+      queries: [
+        {
+          joinType: 'AND',
+          matchers: [
+            {
+              type: 'String',
+              attribute: 'prisonId',
+              condition: 'IS',
+              searchTerm: prisonId,
+            },
+            {
+              type: 'String',
+              attribute: 'cellLocation',
+              condition: 'IN',
+              searchTerm: 'CSWAP',
+            },
+          ],
+        },
+      ],
+    }
+    return this.restClient.post<PagedList<Prisoner>>({
+      path: '/attribute-search?size=2000',
+      data: attributeRequest,
+    })
+  }
 }

server/routes/establishmentRollRouter.ts

@@ -31,6 +31,7 @@ export default function establishmentRollRouter(services: Services): Router {
   get('/out-today', establishmentRollController.getOutToday())
   get('/en-route', establishmentRollController.getEnRoute())
   get('/in-reception', establishmentRollController.getInReception())
+  get('/no-cell-allocated', establishmentRollController.getUnallocated())
 
   return router
 }