add prison api client

Author: madebyzak

assets/js/index.js

@@ -3,3 +3,38 @@ import * as mojFrontend from '@ministryofjustice/frontend'
 
 govukFrontend.initAll()
 mojFrontend.initAll()
+
+document.addEventListener('DOMContentLoaded', function initPrisonerLookup() {
+  const findPrisonerButton = document.getElementById('prisoner-number-lookup')
+  const prisonerNumberInput = document.getElementById('prison-number')
+  const prisonerNameInput = document.getElementById('prisoner-name')
+  const prisonerNameDisplay = document.getElementById('prisoner-name-display')
+
+  async function handlePrisonerLookup(event) {
+    event.preventDefault()
+
+    const prisonNumber = prisonerNumberInput.value.trim()
+    if (!prisonNumber) {
+      prisonerNameDisplay.innerText = 'Prisoner name: Not found'
+      return
+    }
+
+    try {
+      const response = await fetch(`/log/prisoner-details/find?prisonNumber=${encodeURIComponent(prisonNumber)}`)
+      const data = await response.json()
+
+      if (response.ok) {
+        prisonerNameInput.value = data.prisonerName
+        prisonerNameDisplay.innerText = `Prisoner name: ${data.prisonerName}`
+      } else {
+        prisonerNameInput.value = ''
+        prisonerNameDisplay.innerText = 'Prisoner name: Not found'
+      }
+    } catch (e) {
+      prisonerNameInput.value = ''
+      prisonerNameDisplay.innerText = 'Prisoner name: Not found'
+    }
+  }
+
+  findPrisonerButton.addEventListener('click', handlePrisonerLookup)
+})

server/config.ts

@@ -93,6 +93,15 @@ export default {
       agent: new AgentConfig(Number(get('TOKEN_VERIFICATION_API_TIMEOUT_RESPONSE', 5000))),
       enabled: get('TOKEN_VERIFICATION_ENABLED', 'false') === 'true',
     },
+    prison: {
+      url: get('PRISON_API_URL', 'http://localhost:8080', requiredInProduction),
+      healthPath: '/health/ping',
+      timeout: {
+        response: Number(get('PRISONER_DETAILS_API_TIMEOUT_RESPONSE', 10000)),
+        deadline: Number(get('PRISONER_DETAILS_API_TIMEOUT_DEADLINE', 10000)),
+      },
+      agent: new AgentConfig(Number(get('PRISONER_DETAILS_API_TIMEOUT_RESPONSE', 10000))),
+    },
   },
   sqs: {
     audit: auditConfig(),

server/data/api/prisonApiClient.ts

@@ -0,0 +1,22 @@
+import logger from '../../../logger'
+import config, { ApiConfig } from '../../config'
+import RestClient from '../restClient'
+
+export default class PrisonApiClient {
+  public restClient: RestClient
+
+  constructor(token: string) {
+    this.restClient = new RestClient('prisonApiClient', config.apis.prison as ApiConfig, token)
+  }
+
+  async getPrisonerByPrisonNumber(prisonNumber: string): Promise<{ firstName: string; lastName: string } | null> {
+    try {
+      return await this.restClient.get({
+        path: `/api/prisoners/${prisonNumber}`,
+      })
+    } catch (error) {
+      logger.error(`Error fetching prisoner`, error)
+      return null
+    }
+  }
+}

server/data/index.ts

@@ -16,6 +16,7 @@ import RedisTokenStore from './tokenStore/redisTokenStore'
 import InMemoryTokenStore from './tokenStore/inMemoryTokenStore'
 import config from '../config'
 import HmppsAuditClient from './hmppsAuditClient'
+import PrisonApiClient from './api/prisonApiClient'
 
 type RestClientBuilder<T> = (token: string) => T
 
@@ -25,8 +26,9 @@ export const dataAccess = () => ({
     config.redis.enabled ? new RedisTokenStore(createRedisClient()) : new InMemoryTokenStore(),
   ),
   hmppsAuditClient: new HmppsAuditClient(config.sqs.audit),
+  prisonApiClientBuilder: ((token: string) => new PrisonApiClient(token)) as RestClientBuilder<PrisonApiClient>,
 })
 
 export type DataAccess = ReturnType<typeof dataAccess>
 
-export { HmppsAuthClient, RestClientBuilder, HmppsAuditClient }
+export { HmppsAuthClient, RestClientBuilder, HmppsAuditClient, PrisonApiClient }

server/routes/applications/index.ts

@@ -4,8 +4,15 @@ import AuditService, { Page } from '../../services/auditService'
 import applicationTypeRoutes from './applicationTypeRoutes'
 import prisonerDetailsRoutes from './prisonerDetailsRoutes'
 import swapVosPinCreditDetailsRoutes from './swapVosPinCreditDetailsRoutes'
+import PrisonService from '../../services/prisonService'
 
-export default function applicationsRoutes({ auditService }: { auditService: AuditService }): Router {
+export default function applicationsRoutes({
+  auditService,
+  prisonService,
+}: {
+  auditService: AuditService
+  prisonService: PrisonService
+}): Router {
   const router = Router()
 
   router.get(
@@ -50,7 +57,7 @@ export default function applicationsRoutes({ auditService }: { auditService: Aud
   )
 
   router.use(applicationTypeRoutes({ auditService }))
-  router.use(prisonerDetailsRoutes({ auditService }))
+  router.use(prisonerDetailsRoutes({ auditService, prisonService }))
   router.use(swapVosPinCreditDetailsRoutes({ auditService }))
 
   return router

server/routes/applications/prisonerDetailsRoutes.ts

@@ -2,8 +2,15 @@ import { Request, Response, Router } from 'express'
 import asyncMiddleware from '../../middleware/asyncMiddleware'
 import AuditService, { Page } from '../../services/auditService'
 import { updateSessionData } from '../../utils/session'
+import PrisonService from '../../services/prisonService'
 
-export default function prisonerDetailsRoutes({ auditService }: { auditService: AuditService }): Router {
+export default function prisonerDetailsRoutes({
+  auditService,
+  prisonService,
+}: {
+  auditService: AuditService
+  prisonService: PrisonService
+}): Router {
   const router = Router()
 
   router.get(
@@ -25,6 +32,29 @@ export default function prisonerDetailsRoutes({ auditService }: { auditService:
     }),
   )
 
+  router.get(
+    '/log/prisoner-details/find',
+    asyncMiddleware(async (req: Request, res: Response) => {
+      const { prisonNumber } = req.query
+
+      if (!prisonNumber) {
+        res.status(400).json({ error: 'Prison number is required' })
+        return
+      }
+
+      const prisoner = await prisonService.getPrisonerByPrisonNumber(prisonNumber.toString())
+
+      if (!prisoner) {
+        res.status(404).json({ error: 'Prisoner not found' })
+        return
+      }
+
+      res.json({
+        prisonerName: `${prisoner.firstName} ${prisoner.lastName}`,
+      })
+    }),
+  )
+
   router.post(
     '/log/prisoner-details',
     asyncMiddleware(async (req: Request, res: Response) => {

server/routes/index.ts

@@ -4,10 +4,10 @@ import type { Services } from '../services'
 
 import applicationsRoutes from './applications'
 
-export default function routes({ auditService }: Services): Router {
+export default function routes({ auditService, prisonService }: Services): Router {
   const router = Router()
 
-  router.use('/', applicationsRoutes({ auditService }))
+  router.use('/', applicationsRoutes({ auditService, prisonService }))
 
   return router
 }

server/services/index.ts

@@ -1,14 +1,17 @@
 import { dataAccess } from '../data'
 import AuditService from './auditService'
+import PrisonService from './prisonService'
 
 export const services = () => {
-  const { applicationInfo, hmppsAuditClient } = dataAccess()
+  const { applicationInfo, hmppsAuditClient, hmppsAuthClient, prisonApiClientBuilder } = dataAccess()
 
   const auditService = new AuditService(hmppsAuditClient)
+  const prisonService = new PrisonService(hmppsAuthClient, prisonApiClientBuilder)
 
   return {
     applicationInfo,
     auditService,
+    prisonService,
   }
 }
 

server/services/prisonService.ts

@@ -0,0 +1,20 @@
+import { HmppsAuthClient, RestClientBuilder } from '../data'
+import PrisonApiClient from '../data/api/prisonApiClient'
+
+export default class PrisonService {
+  constructor(
+    private readonly hmppsAuthClient: HmppsAuthClient,
+    private readonly prisonApiClientFactory: RestClientBuilder<PrisonApiClient>,
+  ) {}
+
+  async getPrisonerByPrisonNumber(prisonNumber: string): Promise<{ firstName: string; lastName: string }> {
+    const token = await this.hmppsAuthClient.getSystemClientToken()
+    const prisonApiClient = this.prisonApiClientFactory(token)
+
+    const prisoner = await prisonApiClient.getPrisonerByPrisonNumber(prisonNumber)
+    return {
+      firstName: prisoner.firstName,
+      lastName: prisoner.lastName,
+    }
+  }
+}

server/views/pages/log/prisoner-details.njk

@@ -36,11 +36,12 @@
       </div>
 
       {{ govukInsetText({
-        text: "Prisoner name: Patel, Taj",
-        classes: "govuk-!-margin-top-0"
+        text: "Prisoner name: Not found",
+        classes: "govuk-!-margin-top-0",
+        attributes: { id: "prisoner-name-display" }
       }) }}
 
-      <input type="hidden" id="prisoner-name" name="prisonerName" value="Patel, Taj">
+      <input type="hidden" id="prisoner-name" name="prisonerName" value="">
 
       {{ mojDatePicker({
         id: "date",