CDPS-59 - Staff Contacts component

assets/scss/components/_alerts.scss

@@ -12,7 +12,6 @@
     font-weight: 300;
     text-align: center;
     line-height: 1;
-    min-width: 100px;
   }
 
   @media print {
@@ -40,7 +39,7 @@
   gap: 15px;
 
   li {
-    padding: 0 5px;
+    padding: 0 10px;
     margin-bottom: 0;
     background-color: govuk-colour('white');
   }

helm_deploy/values-dev.yaml

@@ -17,6 +17,8 @@ generic-service:
     DPS_HOME_PAGE_URL: "https://digital-dev.prison.service.justice.gov.uk"
     PRISONER_SEARCH_API_URL: "https://prisoner-offender-search-dev.prison.service.justice.gov.uk"
     PRISON_API_URL: "https://api-dev.prison.service.justice.gov.uk"
+    ALLOCATION_MANAGER_ENDPOINT_URL: "https://allocation-manager-staging.apps.live-1.cloud-platform.service.justice.gov.uk"
+    KEYWORKER_API_URL: "https://keyworker-api-dev.prison.service.justice.gov.uk"
 
 generic-prometheus-alerts:
   alertSeverity: digital-prison-service-dev

integration_tests/e2e/overviewPage.cy.ts

@@ -148,4 +148,13 @@ context('SignIn', () => {
       overviewPage.schedule().evening().item(1).should('include.text', 'VLB - Test')
     })
   })
+
+  context('Staff contacts', () => {
+    it('Displays the offender staff contact details', () => {
+      cy.task('stubDpsOverviewPage')
+      cy.signIn()
+      const overviewPage = Page.verifyOnPage(OverviewPage)
+      overviewPage.staffContacts().should('exist')
+    })
+  })
 })

integration_tests/pages/overviewPage.ts

@@ -65,6 +65,8 @@ export default class OverviewPage extends Page {
 
   personalDetails = (): PageElement => cy.get('[data-qa=personal-details]')
 
+  staffContacts = (): PageElement => cy.get('[data-qa=staff-contacts]')
+
   schedule = () => ({
     morning: () => ({
       column: (): PageElement => cy.get('[data-qa=morning-schedule]'),

server/config.ts

@@ -83,6 +83,22 @@ export default {
       agent: new AgentConfig(Number(get('PRISONER_SEARCH_API_TIMEOUT_DEADLINE', 20000))),
     },
     dpsHomePageUrl: get('DPS_HOME_PAGE_URL', 'http://localhost:3001', requiredInProduction),
+    allocationManager: {
+      url: process.env.ALLOCATION_MANAGER_ENDPOINT_URL || '',
+      timeout: {
+        response: Number(get('ALLOCATION_MANAGER_API_TIMEOUT_SECONDS', 20000)),
+        deadline: Number(get('ALLOCATION_MANAGER_API_TIMEOUT_SECONDS', 20000)),
+      },
+      agent: new AgentConfig(Number(get('ALLOCATION_MANAGER_API_TIMEOUT_DEADLINE', 20000))),
+    },
+    keyworker: {
+      url: process.env.KEYWORKER_API_URL || 'http://localhost:8081/',
+      timeout: {
+        response: Number(get('KEYWORKER_API_TIMEOUT_SECONDS', 20000)),
+        deadline: Number(get('AKEYWORKER_API_TIMEOUT_SECONDS', 20000)),
+      },
+      agent: new AgentConfig(Number(get('KEYWORKER_API_TIMEOUT_DEADLINE', 20000))),
+    },
   },
   domain: get('INGRESS_URL', 'http://localhost:3000', requiredInProduction),
   localMockData: get('LOCAL_MOCK_DATA', false),

server/data/allocationManagerApiClient.ts

@@ -0,0 +1,19 @@
+import RestClient from './restClient'
+import config from '../config'
+import { Pom } from '../interfaces/pom'
+
+export default class AllocationManagerClient {
+  restClient: RestClient
+
+  constructor(token: string) {
+    this.restClient = new RestClient('Allocation Manager API', config.apis.allocationManager, token)
+  }
+
+  async getPomByOffenderNo(offenderNumber: string): Promise<Pom> {
+    try {
+      return await this.restClient.get<Pom>({ path: `/api/allocation/${offenderNumber}` })
+    } catch (error) {
+      return error
+    }
+  }
+}

server/data/interfaces/allocationManagerClient.ts

@@ -0,0 +1,5 @@
+import { Pom } from '../../interfaces/pom'
+
+export default interface AllocationManagerClient {
+  getPomByOffenderNo(prisonerNumber: string): Promise<Pom>
+}

server/data/interfaces/keyWorkerClient.ts

@@ -0,0 +1,5 @@
+import { KeyWorker } from '../../interfaces/keyWorker'
+
+export default interface KeyWorkerClient {
+  getOffendersKeyWorker(prisonerNumber: string): Promise<KeyWorker>
+}

server/data/interfaces/prisonApiClient.ts

@@ -6,6 +6,8 @@ import { AdjudicationSummary } from '../../interfaces/adjudicationSummary'
 import { VisitSummary } from '../../interfaces/visitSummary'
 import { VisitBalances } from '../../interfaces/visitBalances'
 import { Assessment } from '../../interfaces/assessment'
+import { OffenderContacts } from '../../interfaces/staffContacts'
+import { CaseNote } from '../../interfaces/caseNote'
 import { ScheduledEvent } from '../../interfaces/scheduledEvent'
 
 export interface PrisonApiClient {
@@ -17,5 +19,7 @@ export interface PrisonApiClient {
   getVisitSummary(bookingId: number): Promise<VisitSummary>
   getVisitBalances(prisonerNumber: string): Promise<VisitBalances>
   getAssessments(bookingId: number): Promise<Assessment[]>
+  getOffenderContacts(bookingId: number): Promise<OffenderContacts>
+  getCaseNoteSummaryByTypes(params: object): Promise<CaseNote[]>
   getEventsScheduledForToday(bookingId: number): Promise<ScheduledEvent[]>
 }

server/data/keyWorkersApiClient.ts

@@ -0,0 +1,22 @@
+import RestClient from './restClient'
+import config from '../config'
+import { KeyWorker } from '../interfaces/keyWorker'
+
+export default class KeyWorkerClient {
+  restClient: RestClient
+
+  caseLoadId: string
+
+  constructor(token: string, caseLoadId: string) {
+    this.restClient = new RestClient('KeyWorkers API', config.apis.keyworker, token)
+    this.caseLoadId = caseLoadId
+  }
+
+  async getOffendersKeyWorker(offenderNumber: string): Promise<KeyWorker> {
+    try {
+      return await this.restClient.get<KeyWorker>({ path: `/key-worker/${this.caseLoadId}/offender/${offenderNumber}` })
+    } catch (error) {
+      return error
+    }
+  }
+}

server/data/localMockData/keyWorker.ts

@@ -0,0 +1,12 @@
+import { KeyWorker } from '../../interfaces/keyWorker'
+
+export const keyWorkerMock: KeyWorker = {
+  staffId: 3532453,
+  firstName: 'Dave',
+  lastName: 'Stevens',
+  email: '1@1.com',
+}
+
+export default {
+  keyWorkerMock,
+}

server/data/localMockData/pom.ts

@@ -0,0 +1,10 @@
+import { Pom } from '../../interfaces/pom'
+
+export const pomMock: Pom = {
+  primary_pom: { staff_id: 485887, name: 'MARKE, ANDY' },
+  secondary_pom: { staff_id: 485829, name: 'HUDSON, ANDY' },
+}
+
+export default {
+  pomMock,
+}

server/data/localMockData/staffContacts.ts

@@ -0,0 +1,16 @@
+import { convertToTitleCase } from '../../utils/utils'
+import { keyWorkerMock } from './keyWorker'
+
+export const StaffContactsMock = {
+  keyWorker: {
+    name: `${convertToTitleCase(keyWorkerMock.firstName)} ${convertToTitleCase(keyWorkerMock.lastName)}`,
+    lastSession: '',
+  },
+  prisonOffenderManager: 'Andy Marke',
+  coworkingPrisonOffenderManager: 'Andy Hudson',
+  communityOffenderManager: 'Not assigned',
+}
+
+export default {
+  StaffContactsMock,
+}

server/data/prisonApiClient.ts

@@ -13,6 +13,9 @@ import { AdjudicationSummary } from '../interfaces/adjudicationSummary'
 import { VisitSummary } from '../interfaces/visitSummary'
 import { VisitBalances } from '../interfaces/visitBalances'
 import { Assessment } from '../interfaces/assessment'
+import { OffenderContacts } from '../interfaces/staffContacts'
+import { mapToQueryString } from '../utils/utils'
+import { CaseNote } from '../interfaces/caseNote'
 import { ScheduledEvent } from '../interfaces/scheduledEvent'
 import dummyScheduledEvents from './localMockData/eventsForToday'
 
@@ -91,4 +94,20 @@ export default class PrisonApiRestClient implements PrisonApiClient {
       dummyScheduledEvents,
     )
   }
+
+  async getOffenderContacts(bookingId: number): Promise<OffenderContacts> {
+    try {
+      return await this.restClient.get<OffenderContacts>({ path: `/api/bookings/${bookingId}/contacts` })
+    } catch (error) {
+      return error
+    }
+  }
+
+  async getCaseNoteSummaryByTypes(params: object): Promise<CaseNote[]> {
+    try {
+      return await this.restClient.get<CaseNote[]>({ path: `/api/case-notes/summary?${mapToQueryString(params)}` })
+    } catch (error) {
+      return error
+    }
+  }
 }

server/interfaces/caseNote.ts

@@ -0,0 +1,7 @@
+export type CaseNote = {
+  bookingId: number
+  caseNoteType: string
+  caseNoteSubType: string
+  numCaseNotes: number
+  latestCaseNote: string
+}

server/interfaces/keyWorker.ts

@@ -0,0 +1,6 @@
+export interface KeyWorker {
+  staffId: number
+  firstName: string
+  lastName: string
+  email: string
+}

server/interfaces/pom.ts

@@ -0,0 +1,4 @@
+export interface Pom {
+  primary_pom: { staff_id: number; name: string }
+  secondary_pom: { staff_id: number; name: string }
+}

server/interfaces/staffContacts.ts

@@ -0,0 +1,38 @@
+export interface StaffContacts {
+  keyWorker: KeyWorkerUI
+  prisonOffenderManager: string
+  coworkingPrisonOffenderManager: string
+  communityOffenderManager: string
+}
+
+export interface KeyWorkerUI {
+  name: string
+  lastSession: string
+}
+
+export interface OffenderContact {
+  lastName: string
+  firstName: string
+  middleName: string
+  contactType: string
+  contactTypeDescription: string
+  relationship: string
+  relationshipDescription: string
+  commentText: string
+  emergencyContact: boolean
+  nextOfKin: boolean
+  relationshipId: number
+  personId: number
+  activeFlag: boolean
+  expiryDate: string
+  approvedVisitorFlag: boolean
+  canBeContactedFlag: boolean
+  awareOfChargesFlag: boolean
+  contactRootOffenderId: number
+  bookingId: number
+  createDateTime: string
+}
+
+export interface OffenderContacts {
+  otherContacts: OffenderContact[]
+}

server/routes/index.ts

@@ -11,6 +11,9 @@ import PrisonerSearchClient from '../data/prisonerSearchClient'
 
 import { mapHeaderData } from '../mappers/headerMappers'
 import { PageConfig } from '../interfaces/pageConfig'
+import AllocationManagerClient from '../data/allocationManagerApiClient'
+import KeyWorkersClient from '../data/keyWorkersApiClient'
+import { convertToTitleCase } from '../utils/utils'
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export default function routes(service: Services): Router {
@@ -27,10 +30,13 @@ export default function routes(service: Services): Router {
 
   get('/prisoner/:prisonerNumber', async (req, res, next) => {
     const prisonerSearchClient = new PrisonerSearchClient(res.locals.clientToken)
+    const prisonApiClient = new PrisonApiRestClient(res.locals.clientToken)
+    const allocationManagerClient = new AllocationManagerClient(res.locals.clientToken)
+    const keyWorkersClient = new KeyWorkersClient(res.locals.clientToken, res.locals.user.activeCaseLoadId)
+
     const prisonerData: Prisoner = await prisonerSearchClient.getPrisonerDetails(req.params.prisonerNumber)
 
-    const prisonApi = new PrisonApiRestClient(res.locals.clientToken)
-    const overviewPageService = new OverviewPageService(prisonApi)
+    const overviewPageService = new OverviewPageService(prisonApiClient, allocationManagerClient, keyWorkersClient)
     const overviewPageData = await overviewPageService.get(prisonerData)
 
     const pageConfig: PageConfig = DisplayBanner
@@ -65,7 +71,7 @@ export default function routes(service: Services): Router {
         href: '#',
       },
       {
-        text: `${prisonerData.lastName} ,${prisonerData.firstName}`,
+        text: `${convertToTitleCase(prisonerData.lastName)} ,${convertToTitleCase(prisonerData.firstName)}`,
         href: `/prisoner/${req.params.prisonerNumber}`,
       },
     ]