CDPS-376: Get COM from Delius

cypress.config.ts

@@ -15,6 +15,7 @@ import pathfinderApi from './integration_tests/mockApis/pathfinderApi'
 import socApi from './integration_tests/mockApis/socApi'
 import adjudicationsApi from './integration_tests/mockApis/adjudications'
 import nonAssociationsApi from './integration_tests/mockApis/nonAssociationsApi'
+import prisonerProfileDeliusApi from './integration_tests/mockApis/prisonerProfileDeliusApi'
 
 export default defineConfig({
   viewportWidth: 1152,
@@ -26,7 +27,6 @@ export default defineConfig({
   reporterOptions: {
     configFile: 'reporter-config.json',
   },
-  videoUploadOnPasses: false,
   taskTimeout: 60000,
   e2e: {
     // We've imported your old cypress plugins here.
@@ -49,6 +49,7 @@ export default defineConfig({
         ...socApi,
         ...adjudicationsApi,
         ...nonAssociationsApi,
+        ...prisonerProfileDeliusApi,
       })
     },
     baseUrl: 'http://localhost:3007',

feature.env

@@ -27,9 +27,9 @@ PATHFINDER_UI_URL=http://localhost:9091/pathfinderui
 MANAGE_SOC_CASES_UI_URL=http://localhost:9091/managesoccasesui
 NON_ASSOCIATIONS_UI_URL=http://localhost:9091/nonassociationsui
 NON_ASSOCIATIONS_PRISONS=MDI,LGI,FNI,ISI,RSI
-WELCOME_PEOPLE_INTO_PRISON_UI_URL=https://welcome-dev.prison.service.justice.gov.uk
 MANAGE_ADJUDICATIONS_API_URL=http://localhost:9091/adjudications
-CALCULATE_RELEASE_DATES_UI_URL=https://localhost:9091/calculateRelease
+CALCULATE_RELEASE_DATES_UI_URL=http://localhost:9091/calculateRelease
+PRISONER_PROFILE_DELIUS_API_URL=http://localhost:9091/delius
 FEEDBACK_DISABLED_PRISONS=LEI
 SYSTEM_PHASE=DEV
 NEURODIVERSITY_ENABLED_PRISONS=MDI

helm_deploy/values-dev.yaml

@@ -48,6 +48,7 @@ generic-service:
     COMPONENT_API_URL: "https://frontend-components-dev.hmpps.service.justice.gov.uk"
     COMPONENT_API_LATEST: "true"
     PROFILE_ADD_APPOINTMENT_ENABLED: "true"
+    PRISONER_PROFILE_DELIUS_API_URL: "https://prisoner-profile-and-delius-dev.hmpps.service.justice.gov.uk"
 
 generic-prometheus-alerts:
   alertSeverity: hmpps-prisoner-profile-non-prod

helm_deploy/values-preprod.yaml

@@ -48,6 +48,7 @@ generic-service:
     COMPONENT_API_URL: "https://frontend-components-preprod.hmpps.service.justice.gov.uk"
     COMPONENT_API_LATEST: "true"
     PROFILE_ADD_APPOINTMENT_ENABLED: "true"
+    PRISONER_PROFILE_DELIUS_API_URL: "https://prisoner-profile-and-delius-preprod.hmpps.service.justice.gov.uk"
 
   allowlist:
     office: "217.33.148.210/32"

helm_deploy/values-prod.yaml

@@ -52,6 +52,7 @@ generic-service:
     COMPONENT_API_URL: "https://frontend-components.hmpps.service.justice.gov.uk"
     COMPONENT_API_LATEST: "false"
     PROFILE_ADD_APPOINTMENT_ENABLED: "false"
+    PRISONER_PROFILE_DELIUS_API_URL: "https://prisoner-profile-and-delius.hmpps.service.justice.gov.uk"
 
   allowlist:
     office: "217.33.148.210/32"

integration_tests/mockApis/prisonerProfileDeliusApi.ts

@@ -0,0 +1,20 @@
+import { stubFor } from './wiremock'
+import { communityManagerMock } from '../../server/data/localMockData/communityManagerMock'
+
+export default {
+  stubGetCommunityManager: () => {
+    return stubFor({
+      request: {
+        method: 'GET',
+        urlPattern: `/delius/probation-cases/G6123VU/community-manager`,
+      },
+      response: {
+        status: 200,
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        jsonBody: communityManagerMock,
+      },
+    })
+  },
+}

integration_tests/support/commands.ts

@@ -40,6 +40,7 @@ Cypress.Commands.add(
     cy.task('stubGetLearnerNeurodivergence', prisonerNumber)
     cy.task('stubInmateDetail', bookingId)
     cy.task('stubMovements', prisonerNumber)
+    cy.task('stubGetCommunityManager')
   },
 )
 

server/config.ts

@@ -172,6 +172,14 @@ export default {
       agent: new AgentConfig(Number(get('COMPONENT_API_TIMEOUT_SECONDS', 20000))),
       latest: get('COMPONENT_API_LATEST', 'false') === 'true',
     },
+    prisonerProfileDeliusApi: {
+      url: get('PRISONER_PROFILE_DELIUS_API_URL', 'http://localhost:8082', requiredInProduction),
+      timeout: {
+        response: Number(get('PRISONER_PROFILE_DELIUS_API_TIMEOUT_RESPONSE', 20000)),
+        deadline: Number(get('PRISONER_PROFILE_DELIUS_API_TIMEOUT_DEADLINE', 20000)),
+      },
+      agent: new AgentConfig(Number(get('PRISONER_PROFILE_DELIUS_API_TIMEOUT_DEADLINE', 20000))),
+    },
   },
   serviceUrls: {
     offenderCategorisation: get('OFFENDER_CATEGORISATION_UI_URL', 'http://localhost:3001', requiredInProduction),

server/data/index.ts

@@ -21,6 +21,7 @@ import AdjudicationsApiRestClient from './adjudicationsApiClient'
 import NonAssociationsApiRestClient from './nonAssociationsApiClient'
 import ComponentApiRestClient from './componentApiClient'
 import WhereaboutsRestApiClient from './whereaboutsClient'
+import PrisonerProfileDeliusApiRestClient from './prisonerProfileDeliusApiClient'
 
 initialiseAppInsights()
 buildAppInsightsClient()
@@ -44,6 +45,7 @@ export const dataAccess = {
   nonAssociationsApiClientBuilder: (token: string) => new NonAssociationsApiRestClient(token),
   componentApiClientBuilder: (token: string) => new ComponentApiRestClient(token),
   whereaboutsApiClientBuilder: (token: string) => new WhereaboutsRestApiClient(token),
+  prisonerProfileDeliusApiClientBuilder: (token: string) => new PrisonerProfileDeliusApiRestClient(token),
 }
 
 export type DataAccess = typeof dataAccess

server/data/interfaces/prisonerProfileDeliusApiClient.ts

@@ -0,0 +1,5 @@
+import { CommunityManager } from '../../interfaces/prisonerProfileDeliusApi/communityManager'
+
+export interface PrisonerProfileDeliusApiClient {
+  getCommunityManager(prisonerNumber: string): Promise<CommunityManager | null>
+}

server/data/localMockData/communityManagerMock.ts

@@ -0,0 +1,9 @@
+import { CommunityManager } from '../../interfaces/prisonerProfileDeliusApi/communityManager'
+
+// eslint-disable-next-line import/prefer-default-export
+export const communityManagerMock: CommunityManager = {
+  code: 'ABC',
+  name: { forename: 'Terry', surname: 'Scott', email: 'terry@email.com' },
+  team: { code: 'XYZ', description: 'Probation Team', email: 'team@email.com' },
+  unallocated: false,
+}

server/data/localMockData/staffContacts.ts

@@ -8,7 +8,7 @@ export const StaffContactsMock = {
   },
   prisonOffenderManager: 'Andy Marke',
   coworkingPrisonOffenderManager: 'Andy Hudson',
-  communityOffenderManager: 'Not assigned',
+  communityOffenderManager: 'Terry Scott',
 }
 
 export default {

server/data/prisonerProfileDeliusApiClient.test.ts

@@ -0,0 +1,41 @@
+import nock from 'nock'
+import config from '../config'
+import PrisonerProfileDeliusApiRestClient from './prisonerProfileDeliusApiClient'
+import { PrisonerProfileDeliusApiClient } from './interfaces/prisonerProfileDeliusApiClient'
+import { communityManagerMock } from './localMockData/communityManagerMock'
+
+jest.mock('./tokenStore')
+
+const token = { access_token: 'token-1', expires_in: 300 }
+
+describe('prisonerProfileDeliusApiClient', () => {
+  let fakePrisonerProfileDeliusApi: nock.Scope
+  let prisonerProfileDeliusApiClient: PrisonerProfileDeliusApiClient
+
+  beforeEach(() => {
+    fakePrisonerProfileDeliusApi = nock(config.apis.prisonerProfileDeliusApi.url)
+    prisonerProfileDeliusApiClient = new PrisonerProfileDeliusApiRestClient(token.access_token)
+  })
+
+  afterEach(() => {
+    jest.resetAllMocks()
+    nock.cleanAll()
+  })
+
+  const mockSuccessfulApiCall = <TReturnData>(url: string, returnData: TReturnData) => {
+    fakePrisonerProfileDeliusApi
+      .get(url)
+      .matchHeader('authorization', `Bearer ${token.access_token}`)
+      .reply(200, returnData)
+  }
+
+  describe('getCommunityManager', () => {
+    it('Should return data from the API', async () => {
+      const prisonerNumber = 'AB1234Y'
+      mockSuccessfulApiCall(`/probation-cases/${prisonerNumber}/community-manager`, communityManagerMock)
+
+      const output = await prisonerProfileDeliusApiClient.getCommunityManager(prisonerNumber)
+      expect(output).toEqual(communityManagerMock)
+    })
+  })
+})

server/data/prisonerProfileDeliusApiClient.ts

@@ -0,0 +1,19 @@
+import RestClient from './restClient'
+import config from '../config'
+import { CommunityManager } from '../interfaces/prisonerProfileDeliusApi/communityManager'
+import { PrisonerProfileDeliusApiClient } from './interfaces/prisonerProfileDeliusApiClient'
+
+export default class PrisonerProfileDeliusApiRestClient implements PrisonerProfileDeliusApiClient {
+  private readonly restClient: RestClient
+
+  constructor(token: string) {
+    this.restClient = new RestClient('Prisoner Profile Delius API', config.apis.prisonerProfileDeliusApi, token)
+  }
+
+  async getCommunityManager(prisonerNumber: string): Promise<CommunityManager | null> {
+    return this.restClient.get<CommunityManager | null>({
+      path: `/probation-cases/${prisonerNumber}/community-manager`,
+      ignore404: true,
+    })
+  }
+}

server/interfaces/prisonerProfileDeliusApi/communityManager.ts

@@ -0,0 +1,14 @@
+export interface CommunityManager {
+  code: string
+  name: {
+    forename: string
+    surname: string
+    email?: string
+  }
+  team: {
+    code: string
+    description: string
+    email?: string
+  }
+  unallocated: boolean
+}

server/services/index.ts

@@ -30,6 +30,7 @@ export const services = () => {
     nonAssociationsApiClientBuilder,
     componentApiClientBuilder,
     whereaboutsApiClientBuilder,
+    prisonerProfileDeliusApiClientBuilder,
   } = dataAccess
 
   const userService = new UserService(hmppsAuthClientBuilder, prisonApiClientBuilder)
@@ -48,6 +49,7 @@ export const services = () => {
     offencesPageService,
     curiousApiClientBuilder,
     nonAssociationsApiClientBuilder,
+    prisonerProfileDeliusApiClientBuilder,
   )
   const personalPageService = new PersonalPageService(prisonApiClientBuilder, curiousApiClientBuilder)
   const workAndSkillsPageService = new WorkAndSkillsPageService(curiousApiClientBuilder, prisonApiClientBuilder)

server/services/overviewPageService.test.ts

@@ -61,6 +61,8 @@ import { LearnerGoalsMock } from '../data/localMockData/learnerGoalsMock'
 import { NonAssociationsApiClient } from '../data/interfaces/nonAssociationsApiClient'
 import movementsMock from '../data/localMockData/movementsData'
 import config from '../config'
+import { PrisonerProfileDeliusApiClient } from '../data/interfaces/prisonerProfileDeliusApiClient'
+import { communityManagerMock } from '../data/localMockData/communityManagerMock'
 
 describe('OverviewPageService', () => {
   let prisonApiClient: PrisonApiClient
@@ -92,6 +94,10 @@ describe('OverviewPageService', () => {
     getNonAssociationDetails: jest.fn(async () => nonAssociationDetailsDummyData),
   }
 
+  const prisonerProfileDeliusApiClient: PrisonerProfileDeliusApiClient = {
+    getCommunityManager: jest.fn(async () => communityManagerMock),
+  }
+
   const overviewPageServiceConstruct = jest.fn(() => {
     return new OverviewPageService(
       () => prisonApiClient,
@@ -102,6 +108,7 @@ describe('OverviewPageService', () => {
       new OffencesPageService(null),
       () => curiousApiClient,
       () => nonAssociationsApiClient,
+      () => prisonerProfileDeliusApiClient,
     )
   })
 

server/services/overviewPageService.ts

@@ -11,6 +11,7 @@ import { PrisonApiClient } from '../data/interfaces/prisonApiClient'
 import {
   convertToTitleCase,
   formatCategoryCodeDescription,
+  formatCommunityManager,
   formatMoney,
   formatName,
   formatPrivilegedVisitsSummary,
@@ -23,7 +24,7 @@ import { Assessment } from '../interfaces/prisonApi/assessment'
 import { AssessmentCode } from '../data/enums/assessmentCode'
 import { Prisoner } from '../interfaces/prisoner'
 import { PersonalDetails } from '../interfaces/personalDetails'
-import { ContactDetail, StaffContacts } from '../interfaces/staffContacts'
+import { StaffContacts } from '../interfaces/staffContacts'
 import AllocationManagerClient from '../data/interfaces/allocationManagerClient'
 import KeyWorkerClient from '../data/interfaces/keyWorkerClient'
 import { Pom } from '../interfaces/pom'
@@ -56,6 +57,8 @@ import { NonAssociationDetails } from '../interfaces/nonAssociationDetails'
 import { KeyWorker } from '../interfaces/keyWorker'
 import { CaseNote } from '../interfaces/caseNote'
 import { FullStatus } from '../interfaces/prisonApi/fullStatus'
+import { CommunityManager } from '../interfaces/prisonerProfileDeliusApi/communityManager'
+import { PrisonerProfileDeliusApiClient } from '../data/interfaces/prisonerProfileDeliusApiClient'
 
 export default class OverviewPageService {
   constructor(
@@ -67,6 +70,7 @@ export default class OverviewPageService {
     private readonly offencesPageService: OffencesPageService,
     private readonly curiousApiClientBuilder: RestClientBuilder<CuriousApiClient>,
     private readonly nonAssociationsApiClientBuilder: RestClientBuilder<NonAssociationsApiClient>,
+    private readonly prisonerProfileDeliusApiClientBuilder: RestClientBuilder<PrisonerProfileDeliusApiClient>,
   ) {}
 
   public async get(
@@ -86,33 +90,34 @@ export default class OverviewPageService {
     const adjudicationsApiClient = this.adjudicationsApiClientBuilder(clientToken)
     const curiousApiClient = this.curiousApiClientBuilder(clientToken)
     const nonAssociationsApiClient = this.nonAssociationsApiClientBuilder(clientToken)
+    const prisonerProfileDeliusApiClient = this.prisonerProfileDeliusApiClientBuilder(clientToken)
 
     const [
       inmateDetail,
       staffRoles,
       learnerNeurodivergence,
       movements,
       nonAssociationDetails,
-      offenderContacts,
       allocationManager,
       offenderKeyWorker,
       keyWorkerSessions,
       mainOffence,
       courtCaseData,
       fullStatus,
+      communityManager,
     ] = await Promise.all([
       prisonApiClient.getInmateDetail(prisonerData.bookingId),
       prisonApiClient.getStaffRoles(staffId, prisonerData.prisonId),
       curiousApiClient.getLearnerNeurodivergence(prisonerData.prisonerNumber),
       prisonApiClient.getMovements([prisonerData.prisonerNumber], [MovementType.Transfer]),
       nonAssociationsApiClient.getNonAssociationDetails(prisonerNumber),
-      prisonApiClient.getBookingContacts(prisonerData.bookingId),
       allocationManagerClient.getPomByOffenderNo(prisonerData.prisonerNumber),
       keyWorkerClient.getOffendersKeyWorker(prisonerData.prisonerNumber),
       prisonApiClient.getCaseNoteSummaryByTypes({ type: 'KA', subType: 'KS', numMonths: 38, bookingId }),
       prisonApiClient.getMainOffence(bookingId),
       prisonApiClient.getCourtCases(bookingId),
       prisonApiClient.getFullStatus(prisonerNumber),
+      prisonerProfileDeliusApiClient.getCommunityManager(prisonerNumber),
     ])
 
     const [miniSummaryGroupA, miniSummaryGroupB, personalDetails, schedule, offencesOverview] = await Promise.all([
@@ -147,7 +152,7 @@ export default class OverviewPageService {
       personalDetails,
       staffContacts: this.getStaffContacts(
         prisonerData,
-        offenderContacts,
+        communityManager,
         allocationManager,
         offenderKeyWorker,
         keyWorkerSessions,
@@ -211,21 +216,11 @@ export default class OverviewPageService {
 
   public getStaffContacts(
     prisonerData: Prisoner,
-    offenderContacts: ContactDetail,
+    communityManager: CommunityManager,
     allocationManager: Pom,
     offenderKeyWorker: KeyWorker,
     keyWorkerSessions: CaseNote[],
   ): StaffContacts {
-    const communityOffenderManager =
-      offenderContacts && offenderContacts.otherContacts !== undefined
-        ? offenderContacts.otherContacts
-            .filter(contact => contact && contact.contactType === 'COM')
-            .map(contact => ({
-              firstName: contact ? contact?.firstName : undefined,
-              lastName: contact ? contact?.lastName : undefined,
-            }))
-        : []
-
     const prisonOffenderManager =
       allocationManager &&
       (allocationManager as Pom).primary_pom &&
@@ -255,12 +250,7 @@ export default class OverviewPageService {
       coworkingPrisonOffenderManager: coworkingPrisonOffenderManager
         ? `${coworkingPrisonOffenderManager[0]} ${coworkingPrisonOffenderManager[1]}`
         : 'Not assigned',
-      communityOffenderManager:
-        communityOffenderManager && communityOffenderManager[0] !== undefined
-          ? `${convertToTitleCase(communityOffenderManager[0].firstName)} ${convertToTitleCase(
-              communityOffenderManager[0].lastName,
-            )}`
-          : 'Not assigned',
+      communityOffenderManager: formatCommunityManager(communityManager),
       linkUrl: `${config.serviceUrls.digitalPrison}/prisoner/${prisonerData.prisonerNumber}/professional-contacts`,
     }
   }