Adjust1 304 filter sentences

scripts/generate-prison-api-types.sh

@@ -1 +1 @@
-npx openapi-typescript https://api-dev.prison.service.justice.gov.uk/v3/api-docs > ../server/@types/prisonApi/index.d.ts
+npx openapi-typescript https://prison-api-dev.prison.service.justice.gov.uk/v3/api-docs > ../server/@types/prisonApi/index.d.ts

server/@types/prisonApi/prisonClientTypes.ts

@@ -2,14 +2,8 @@ import { components } from './index'
 
 export type PrisonApiPrisoner = components['schemas']['InmateDetail']
 export type PrisonApiUserCaseloads = components['schemas']['CaseLoad']
-export type PrisonApiSentence = components['schemas']['Sentence']
-export type PrisonApiCharge = components['schemas']['Charge']
-export type PrisonApiCourtCase = components['schemas']['CourtCase']
-export type PrisonApiAdjustment = components['schemas']['Adjustment']
 export type PrisonApiCourtDateResult = components['schemas']['CourtDateResult']
 export type PrisonApiBookingAndSentenceAdjustments = components['schemas']['BookingAndSentenceAdjustments']
 export type PrisonApiSentenceAdjustments = components['schemas']['SentenceAdjustmentValues']
-export type PrisonApiAdjudicationSearchResponse = components['schemas']['AdjudicationSearchResponse']
-export type PrisonApiAdjudication = components['schemas']['AdjudicationDetail']
 export type PrisonApiOffenderSentenceAndOffences = components['schemas']['OffenderSentenceAndOffences']
 export type PrisonApiOffence = components['schemas']['OffenderOffence']

server/api/prisonApiClient.ts

@@ -1,16 +1,10 @@
 import config, { ApiConfig } from '../config'
 import RestClient from '../data/restClient'
 import type {
-  PrisonApiAdjudication,
-  PrisonApiAdjudicationSearchResponse,
-  PrisonApiAdjustment,
   PrisonApiBookingAndSentenceAdjustments,
-  PrisonApiCharge,
-  PrisonApiCourtCase,
   PrisonApiCourtDateResult,
   PrisonApiOffenderSentenceAndOffences,
   PrisonApiPrisoner,
-  PrisonApiSentence,
   PrisonApiUserCaseloads,
 } from '../@types/prisonApi/prisonClientTypes'
 
@@ -29,46 +23,6 @@ export default class PrisonApiClient {
     return this.restClient.get({ path: `/api/users/me/caseLoads` }) as Promise<PrisonApiUserCaseloads[]>
   }
 
-  async getAdjudications(nomsId: string): Promise<PrisonApiAdjudicationSearchResponse> {
-    return this.restClient.get({
-      path: `/api/offenders/${nomsId}/adjudications?finding=PROVED`, // TODO filter by date
-    }) as Promise<PrisonApiAdjudicationSearchResponse>
-  }
-
-  async getAdjudication(nomsId: string, adjudationNumber: number): Promise<PrisonApiAdjudication> {
-    return this.restClient.get({
-      path: `/api/offenders/${nomsId}/adjudications/${adjudationNumber}`,
-    }) as Promise<PrisonApiAdjudication>
-  }
-
-  async createCourtCase(bookingId: number, courtCase: PrisonApiCourtCase): Promise<number> {
-    return this.restClient.post({
-      path: `/api/digital-warrant/booking/${bookingId}/court-case`,
-      data: courtCase,
-    }) as Promise<number>
-  }
-
-  async createCharge(bookingId: number, charge: PrisonApiCharge): Promise<number> {
-    return this.restClient.post({
-      path: `/api/digital-warrant/booking/${bookingId}/charge`,
-      data: charge,
-    }) as Promise<number>
-  }
-
-  async createSentence(bookingId: number, sentence: PrisonApiSentence): Promise<number> {
-    return this.restClient.post({
-      path: `/api/digital-warrant/booking/${bookingId}/sentence`,
-      data: sentence,
-    }) as Promise<number>
-  }
-
-  async createAdjustment(bookingId: number, sentence: PrisonApiAdjustment): Promise<number> {
-    return this.restClient.post({
-      path: `/api/digital-warrant/booking/${bookingId}/adjustment`,
-      data: sentence,
-    }) as Promise<number>
-  }
-
   async getCourtDateResults(nomsId: string): Promise<PrisonApiCourtDateResult[]> {
     return this.restClient.get({
       path: `/api/digital-warrant/court-date-results/${nomsId}`,

server/routes/adjustmentRoutes.ts

@@ -4,7 +4,6 @@ import PrisonerService from '../services/prisonerService'
 import AdjustmentsService from '../services/adjustmentsService'
 import AdjustmentsHubViewModel, { Message } from '../model/adjustmentsHubViewModel'
 import config from '../config'
-import AdditionalDaysModel from '../model/additionalDaysModel'
 import ReviewModel from '../model/reviewModel'
 import AdjustmentsStoreService from '../services/adjustmentsStoreService'
 import WarningModel from '../model/warningModel'
@@ -106,22 +105,6 @@ export default class AdjustmentRoutes {
     return res.redirect(`${config.services.identifyRemandPeriods.url}/${nomsId}`)
   }
 
-  public additionalDays: RequestHandler = async (req, res): Promise<void> => {
-    const { caseloads, token } = res.locals.user
-    const { nomsId } = req.params
-    const prisonerDetail = await this.prisonerService.getPrisonerDetail(nomsId, caseloads, token)
-    const adjudicationsSearch = await this.prisonerService.getAdjudications(nomsId, token)
-    const adjudications = await Promise.all(
-      adjudicationsSearch.results.map(adj =>
-        this.prisonerService.getAdjudication(nomsId, adj.adjudicationNumber, token),
-      ),
-    )
-
-    return res.render('pages/adjustments/additionalDays', {
-      model: new AdditionalDaysModel(prisonerDetail, adjudications),
-    })
-  }
-
   public form: RequestHandler = async (req, res): Promise<void> => {
     const { caseloads, token } = res.locals.user
     const { nomsId, adjustmentTypeUrl, addOrEdit, id } = req.params

server/routes/index.ts

@@ -68,6 +68,7 @@ export default function routes(service: Services): Router {
   get('/:nomsId/remand/remove/:id', remandRoutes.remove)
   get('/:nomsId/remand/edit/:id', remandRoutes.edit)
   post('/:nomsId/remand/edit/:id', remandRoutes.submitEdit)
+  get('/:nomsId/remand/no-applicable-sentences', remandRoutes.noApplicableSentences)
 
   get('/:nomsId/:adjustmentTypeUrl/view', adjustmentRoutes.view)
   get('/:nomsId/:adjustmentTypeUrl/remove/:id', adjustmentRoutes.remove)
@@ -78,7 +79,5 @@ export default function routes(service: Services): Router {
   post('/:nomsId/:adjustmentTypeUrl/:addOrEdit/:id', adjustmentRoutes.submitForm)
 
   get('/:nomsId/remand', adjustmentRoutes.remand)
-  get('/:nomsId/additional-days/add', adjustmentRoutes.additionalDays)
-
   return router
 }

server/routes/remandRoutes.test.ts

@@ -103,15 +103,57 @@ afterEach(() => {
 })
 
 describe('Adjustment routes tests', () => {
-  it('GET /{nomsId}/remand/add', () => {
+  it('GET /{nomsId}/remand/add okay', () => {
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
     adjustmentsStoreService.store.mockReturnValue(SESSION_ID)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
     return request(app)
       .get(`/${NOMS_ID}/remand/add`)
       .expect(302)
       .expect('Location', `/${NOMS_ID}/remand/dates/add/${SESSION_ID}`)
   })
 
+  it('GET /{nomsId}/remand/add no applicable', () => {
+    prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue([])
+    return request(app)
+      .get(`/${NOMS_ID}/remand/add`)
+      .expect(302)
+      .expect('Location', `/${NOMS_ID}/remand/no-applicable-sentences`)
+  })
+
+  it('GET /{nomsId}/remand/no-applicable-sentences', () => {
+    prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
+    return request(app)
+      .get(`/${NOMS_ID}/remand/no-applicable-sentences`)
+      .expect('Content-Type', /html/)
+      .expect(res => {
+        expect(res.text).toContain('Anon')
+        expect(res.text).toContain('Nobody')
+        expect(res.text).toContain(`<a href="/${NOMS_ID}" class="govuk-back-link">Back</a>`)
+        expect(res.text).toContain('Remand cannot be applied as none of the sentence offences are eligible for remand.')
+      })
+  })
+
+  it('GET /{nomsId}/remand/dates/add', () => {
+    const adjustments = {}
+    adjustments[SESSION_ID] = blankAdjustment
+    prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
+    adjustmentsStoreService.getAll.mockReturnValue(adjustments)
+    adjustmentsStoreService.getById.mockReturnValue(blankAdjustment)
+    return request(app)
+      .get(`/${NOMS_ID}/remand/dates/add/${SESSION_ID}`)
+      .expect('Content-Type', /html/)
+      .expect(res => {
+        expect(res.text).toContain('Anon')
+        expect(res.text).toContain('Nobody')
+        expect(res.text).toContain(`<a href="/${NOMS_ID}" class="govuk-back-link">Back</a>`)
+        expect(res.text).toContain('Remand start date')
+        expect(res.text).toContain('Remand end date')
+        expect(res.text).toContain('Continue')
+      })
+  })
+
   describe('POST /{nomsId}/remand/dates/:addOrEdit validation tests', () => {
     test.each`
       addOrEdit | redirectLocation
@@ -219,7 +261,7 @@ describe('Adjustment routes tests', () => {
       const adjustments = {}
       adjustments[SESSION_ID] = blankAdjustment
       prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-      prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+      prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
       adjustmentsStoreService.getById.mockReturnValue(adjustmentWithDates)
       return request(app)
         .get(`/${NOMS_ID}/remand/offences/${addOrEdit}/${SESSION_ID}`)
@@ -264,7 +306,7 @@ describe('Adjustment routes tests', () => {
       ${'edit'}
     `('POST /{nomsId}/remand/offence/:addOrEdit no offences selected', async ({ addOrEdit }) => {
       prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-      prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+      prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
       adjustmentsStoreService.getById.mockReturnValue(adjustmentWithDates)
       return request(app)
         .post(`/${NOMS_ID}/remand/offences/${addOrEdit}/${SESSION_ID}`)
@@ -280,7 +322,7 @@ describe('Adjustment routes tests', () => {
     const adjustments = {}
     adjustments[SESSION_ID] = adjustmentWithDatesAndCharges
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-    prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
     adjustmentsService.findByPerson.mockResolvedValue([])
     calculateReleaseDatesService.calculateUnusedDeductions.mockResolvedValue({
       unusedDeductions: 50,
@@ -343,7 +385,7 @@ describe('Adjustment routes tests', () => {
     const adjustments = {}
     adjustments[SESSION_ID] = adjustmentWithDatesAndCharges
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-    prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
     adjustmentsStoreService.getAll.mockReturnValue(adjustments)
     return request(app)
       .post(`/${NOMS_ID}/remand/review`)
@@ -357,7 +399,7 @@ describe('Adjustment routes tests', () => {
     const adjustments = {}
     adjustments[SESSION_ID] = adjustmentWithDatesAndCharges
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-    prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
     adjustmentsService.findByPerson.mockResolvedValue([])
     calculateReleaseDatesService.calculateUnusedDeductions.mockResolvedValue({
       unusedDeductions: 50,
@@ -385,7 +427,7 @@ describe('Adjustment routes tests', () => {
     const adjustments = {}
     adjustments[SESSION_ID] = adjustmentWithDatesAndCharges
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-    prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
     adjustmentsService.findByPerson.mockResolvedValue([])
     calculateReleaseDatesService.calculateUnusedDeductions.mockRejectedValue({ error: 'an error' })
     adjustmentsStoreService.getAll.mockReturnValue(adjustments)
@@ -409,7 +451,7 @@ describe('Adjustment routes tests', () => {
 
   it('GET /{nomsId}/remand/remove', () => {
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-    prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
     adjustmentsService.get.mockResolvedValue(adjustmentWithDatesAndCharges)
 
     return request(app)
@@ -427,7 +469,7 @@ describe('Adjustment routes tests', () => {
 
   it('POST /{nomsId}/remand/remove', () => {
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-    prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
     adjustmentsService.get.mockResolvedValue(adjustmentWithDatesAndCharges)
 
     return request(app)
@@ -438,7 +480,7 @@ describe('Adjustment routes tests', () => {
 
   it('GET /{nomsId}/remand/edit', () => {
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
-    prisonerService.getSentencesAndOffences.mockResolvedValue(stubbedSentencesAndOffences)
+    prisonerService.getSentencesAndOffencesFilteredForRemand.mockResolvedValue(stubbedSentencesAndOffences)
     adjustmentsService.get.mockResolvedValue(adjustmentWithDatesAndCharges)
 
     return request(app)