crs-1956-nomis-override-date-hints (#872)

Change getNomisCalculationSummary to use an updated CRD endpoint for retrieving Nomis calculation with override dates. It's necessary to pass the bookingId in order to obtain override dates.
ministryofjustice · Jan 21, 2025 · 5e45720 · 5e45720
1 parent 904baca
commit 5e45720
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 17 deletions.
diff --git a/server/api/calculateReleaseDatesApiClient.test.ts b/server/api/calculateReleaseDatesApiClient.test.ts
@@ -55,16 +55,23 @@ describe('Calculate release dates API client tests', () => {
 
     describe('Get nomis calculation summary for prisoner', () => {
       it('Get nomis calculation summary for offenderSentCalcId fails with 404 and throws Error', async () => {
-        fakeApi.get(`/calculation/nomis-calculation-summary/${offenderSentCalcId}`, '').reply(404)
+        const bookingId = 123456
+        fakeApi
+          .get(`/calculation/nomis-calculation-summary/booking/${bookingId}/calculation/${offenderSentCalcId}`, '')
+          .reply(404)
         const client = new CalculateReleaseDatesApiClient(token)
-        await expect(client.getNomisCalculationSummary(offenderSentCalcId)).rejects.toThrow('Not Found')
+        await expect(client.getNomisCalculationSummary(offenderSentCalcId, bookingId)).rejects.toThrow('Not Found')
       })
 
       it('Get nomis calculation summary for offenderSentCalcId successfully', async () => {
+        const bookingId = 123456
         fakeApi
-          .get(`/calculation/nomis-calculation-summary/${offenderSentCalcId}`, '')
+          .get(`/calculation/nomis-calculation-summary/booking/${bookingId}/calculation/${offenderSentCalcId}`, '')
           .reply(200, nomisCalculationSummary)
-        const data = await new CalculateReleaseDatesApiClient(token).getNomisCalculationSummary(offenderSentCalcId)
+        const data = await new CalculateReleaseDatesApiClient(token).getNomisCalculationSummary(
+          offenderSentCalcId,
+          bookingId,
+        )
         expect(data).toEqual(nomisCalculationSummary)
         expect(nock.isDone()).toBe(true)
       })

diff --git a/server/api/calculateReleaseDatesApiClient.ts b/server/api/calculateReleaseDatesApiClient.ts
@@ -329,9 +329,9 @@ export default class CalculateReleaseDatesApiClient {
     }) as Promise<DateTypeDefinition[]>
   }
 
-  getNomisCalculationSummary(offenderSentCalcId: number): Promise<NomisCalculationSummary> {
+  getNomisCalculationSummary(offenderSentCalcId: number, bookingId: number): Promise<NomisCalculationSummary> {
     return this.restClient.get({
-      path: `/calculation/nomis-calculation-summary/${offenderSentCalcId}`,
+      path: `/calculation/nomis-calculation-summary/booking/${bookingId}/calculation/${offenderSentCalcId}`,
     }) as Promise<NomisCalculationSummary>
   }
 

diff --git a/server/routes/viewRoutes.ts b/server/routes/viewRoutes.ts
@@ -310,6 +310,7 @@ export default class ViewRoutes {
     const prisonerDetail = await this.prisonerService.getPrisonerDetail(nomsId, caseloads, token)
     const pastNomisCalculation = await this.calculateReleaseDatesService.getNomisCalculationSummary(
       offenderSentCalculationId,
+      prisonerDetail.bookingId,
       token,
     )
     res.render(

diff --git a/server/services/calculateReleaseDatesService.test.ts b/server/services/calculateReleaseDatesService.test.ts
@@ -175,18 +175,21 @@ describe('Calculate release dates service tests', () => {
 
   describe('Test nomis calculation summary', () => {
     it('asserting successful scenario', async () => {
-      fakeApi.get(`/calculation/nomis-calculation-summary/${offenderSentCalcId}`).reply(200, nomisCalculationSummary)
-
-      const result = await calculateReleaseDatesService.getNomisCalculationSummary(offenderSentCalcId, token)
-
+      const bookingId = 123456
+      fakeApi
+        .get(`/calculation/nomis-calculation-summary/booking/${bookingId}/calculation/${offenderSentCalcId}`)
+        .reply(200, nomisCalculationSummary)
+      const result = await calculateReleaseDatesService.getNomisCalculationSummary(offenderSentCalcId, bookingId, token)
       expect(result).toEqual(nomisCalculationSummary)
     })
     it('asserting fail scenario', async () => {
-      fakeApi.get(`/calculation/nomis-calculation-summary/${offenderSentCalcId}`).reply(404)
-
-      await expect(calculateReleaseDatesService.getNomisCalculationSummary(offenderSentCalcId, token)).rejects.toThrow(
-        'Not Found',
-      )
+      const bookingId = 123456
+      fakeApi
+        .get(`/calculation/nomis-calculation-summary/booking/${bookingId}/calculation/${offenderSentCalcId}`)
+        .reply(404)
+      await expect(
+        calculateReleaseDatesService.getNomisCalculationSummary(offenderSentCalcId, bookingId, token),
+      ).rejects.toThrow('Not Found')
     })
   })
 

diff --git a/server/services/calculateReleaseDatesService.ts b/server/services/calculateReleaseDatesService.ts
@@ -480,8 +480,12 @@ export default class CalculateReleaseDatesService {
     }
   }
 
-  async getNomisCalculationSummary(offenderSentCalcId: number, token: string): Promise<NomisCalculationSummary> {
-    return new CalculateReleaseDatesApiClient(token).getNomisCalculationSummary(offenderSentCalcId)
+  async getNomisCalculationSummary(
+    offenderSentCalcId: number,
+    bookingId: number,
+    token: string,
+  ): Promise<NomisCalculationSummary> {
+    return new CalculateReleaseDatesApiClient(token).getNomisCalculationSummary(offenderSentCalcId, bookingId)
   }
 
   async getReleaseDatesForACalcReqId(calcRequestId: number, token: string): Promise<ReleaseDatesAndCalculationContext> {