From d8590dbcb662f133030797d22e9a7c35967df3db Mon Sep 17 00:00:00 2001
From: Luke Harper <luke.harper@digital.justice.gov.uk>
Date: Wed, 27 Sep 2023 08:58:28 +0100
Subject: [PATCH 1/3] ADJUST1-164 intercept logic.

---
 server/@types/AdaTypes.ts                     |   8 +-
 server/@types/express/index.d.ts              |   1 +
 server/routes/additionalDaysAwardedRoutes.ts  |  34 ++++-
 server/routes/adjustmentRoutes.test.ts        |  24 +++-
 server/routes/adjustmentRoutes.ts             |  23 +++-
 server/routes/index.ts                        |   6 +-
 .../additionalDaysApprovalStoreService.ts     |  30 +++++
 .../additionalDaysAwardedService.test.ts      | 120 +++++++++++++++++-
 .../services/additionalDaysAwardedService.ts  |  72 ++++++++++-
 server/services/index.ts                      |   8 +-
 .../views/pages/adjustments/ada/intercept.njk |  53 ++++++++
 11 files changed, 366 insertions(+), 13 deletions(-)
 create mode 100644 server/services/additionalDaysApprovalStoreService.ts
 create mode 100644 server/views/pages/adjustments/ada/intercept.njk

diff --git a/server/@types/AdaTypes.ts b/server/@types/AdaTypes.ts
index d6103f1d..2d3406b5 100644
--- a/server/@types/AdaTypes.ts
+++ b/server/@types/AdaTypes.ts
@@ -27,4 +27,10 @@ type AdasToReview = {
   totalAwaitingApproval: number
 }
 
-export { ChargeDetails, AdasByDateCharged, Ada, AdasToReview }
+type InterceptType = 'NONE' | 'FIRST_TIME' | 'UPDATE' | 'PADA'
+
+type AdaIntercept = {
+  type: InterceptType
+  number: number
+}
+export { ChargeDetails, AdasByDateCharged, Ada, AdasToReview, InterceptType, AdaIntercept }
diff --git a/server/@types/express/index.d.ts b/server/@types/express/index.d.ts
index c6bc7e46..095d7d1c 100644
--- a/server/@types/express/index.d.ts
+++ b/server/@types/express/index.d.ts
@@ -8,6 +8,7 @@ declare module 'express-session' {
     returnTo: string
     nowInMinutes: number
     adjustments: { string?: Adjustment }
+    additionalDayApprovals: { string?: Date }
   }
 }
 
diff --git a/server/routes/additionalDaysAwardedRoutes.ts b/server/routes/additionalDaysAwardedRoutes.ts
index 9d5e62ff..54b56dd9 100644
--- a/server/routes/additionalDaysAwardedRoutes.ts
+++ b/server/routes/additionalDaysAwardedRoutes.ts
@@ -1,7 +1,8 @@
 import { RequestHandler } from 'express'
 import PrisonerService from '../services/prisonerService'
 import AdditionalDaysAwardedService from '../services/additionalDaysAwardedService'
-import { AdasToReview } from '../@types/AdaTypes'
+import { AdaIntercept, AdasToReview } from '../@types/AdaTypes'
+import AdjustmentsClient from '../api/adjustmentsClient'
 
 export default class AdditionalDaysAwardedRoutes {
   constructor(
@@ -9,6 +10,36 @@ export default class AdditionalDaysAwardedRoutes {
     private readonly additionalDaysAwardedService: AdditionalDaysAwardedService,
   ) {}
 
+  public intercept: RequestHandler = async (req, res): Promise<void> => {
+    const { caseloads, token, username } = res.locals.user
+    const { nomsId } = req.params
+    const prisonerDetail = await this.prisonerService.getPrisonerDetail(nomsId, caseloads, token)
+    const startOfSentenceEnvelope = await this.prisonerService.getStartOfSentenceEnvelope(
+      prisonerDetail.bookingId,
+      token,
+    )
+    const adjustments = await new AdjustmentsClient(token).findByPerson(prisonerDetail.offenderNo)
+
+    const intercept: AdaIntercept = await this.additionalDaysAwardedService.shouldIntercept(
+      req,
+      prisonerDetail,
+      adjustments,
+      startOfSentenceEnvelope,
+      username,
+    )
+
+    if (intercept.type === 'NONE') {
+      return res.redirect(`/${nomsId}`)
+    }
+
+    return res.render('pages/adjustments/ada/intercept', {
+      model: {
+        prisonerDetail,
+        intercept,
+      },
+    })
+  }
+
   public review: RequestHandler = async (req, res): Promise<void> => {
     const { caseloads, token, username } = res.locals.user
     const { nomsId } = req.params
@@ -41,6 +72,7 @@ export default class AdditionalDaysAwardedRoutes {
       token,
     )
     await this.additionalDaysAwardedService.approveAdjudications(
+      req,
       prisonerDetail,
       startOfSentenceEnvelope,
       username,
diff --git a/server/routes/adjustmentRoutes.test.ts b/server/routes/adjustmentRoutes.test.ts
index efe2f773..b76ac618 100644
--- a/server/routes/adjustmentRoutes.test.ts
+++ b/server/routes/adjustmentRoutes.test.ts
@@ -8,16 +8,22 @@ import { Adjustment } from '../@types/adjustments/adjustmentsTypes'
 import IdentifyRemandPeriodsService from '../services/identifyRemandPeriodsService'
 import { Remand, RemandResult } from '../@types/identifyRemandPeriods/identifyRemandPeriodsTypes'
 import AdjustmentsStoreService from '../services/adjustmentsStoreService'
+import AdditionalDaysAwardedService from '../services/additionalDaysAwardedService'
 
 jest.mock('../services/adjustmentsService')
 jest.mock('../services/prisonerService')
 jest.mock('../services/identifyRemandPeriodsService')
 jest.mock('../services/adjustmentsStoreService')
+jest.mock('../services/additionalDaysAwardedService')
 
 const prisonerService = new PrisonerService(null) as jest.Mocked<PrisonerService>
 const adjustmentsService = new AdjustmentsService() as jest.Mocked<AdjustmentsService>
 const identifyRemandPeriodsService = new IdentifyRemandPeriodsService() as jest.Mocked<IdentifyRemandPeriodsService>
 const adjustmentsStoreService = new AdjustmentsStoreService() as jest.Mocked<AdjustmentsStoreService>
+const additionalDaysAwardedService = new AdditionalDaysAwardedService(
+  null,
+  null,
+) as jest.Mocked<AdditionalDaysAwardedService>
 
 const NOMS_ID = 'ABC123'
 
@@ -67,7 +73,13 @@ let app: Express
 
 beforeEach(() => {
   app = appWithAllRoutes({
-    services: { prisonerService, adjustmentsService, identifyRemandPeriodsService, adjustmentsStoreService },
+    services: {
+      prisonerService,
+      adjustmentsService,
+      identifyRemandPeriodsService,
+      adjustmentsStoreService,
+      additionalDaysAwardedService,
+    },
   })
 })
 
@@ -82,6 +94,7 @@ describe('Adjustment routes tests', () => {
       { ...radaAdjustment, prisonName: 'Leeds', lastUpdatedDate: '2023-04-05' },
     ])
     identifyRemandPeriodsService.calculateRelevantRemand.mockResolvedValue(remandResult)
+    additionalDaysAwardedService.shouldIntercept.mockResolvedValue({ type: 'NONE', number: 0 })
     return request(app)
       .get(`/${NOMS_ID}`)
       .expect('Content-Type', /html/)
@@ -96,6 +109,15 @@ describe('Adjustment routes tests', () => {
         expect(res.text).toContain('Last update\n          on 05 April 2023\n          by Leeds')
       })
   })
+  it('GET /{nomsId} is intercepted if there is adas to review', () => {
+    prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
+    adjustmentsService.findByPerson.mockResolvedValue([
+      { ...radaAdjustment, prisonName: 'Leeds', lastUpdatedDate: '2023-04-05' },
+    ])
+    additionalDaysAwardedService.shouldIntercept.mockResolvedValue({ type: 'FIRST_TIME', number: 5 })
+    return request(app).get(`/${NOMS_ID}`).expect(302).expect('Location', `/${NOMS_ID}/additional-days/intercept`)
+  })
+
   it('GET /{nomsId} relevant remand throws error', () => {
     prisonerService.getPrisonerDetail.mockResolvedValue(stubbedPrisonerData)
     adjustmentsService.findByPerson.mockResolvedValue([radaAdjustment])
diff --git a/server/routes/adjustmentRoutes.ts b/server/routes/adjustmentRoutes.ts
index 32474d90..32f7a7f2 100644
--- a/server/routes/adjustmentRoutes.ts
+++ b/server/routes/adjustmentRoutes.ts
@@ -14,6 +14,7 @@ import ViewModel from '../model/viewModel'
 import RemoveModel from '../model/removeModel'
 import AdjustmentsFormFactory from '../model/adjustmentFormFactory'
 import hubValidationMessages from '../model/hubValidationMessages'
+import AdditionalDaysAwardedService from '../services/additionalDaysAwardedService'
 
 export default class AdjustmentRoutes {
   constructor(
@@ -21,6 +22,7 @@ export default class AdjustmentRoutes {
     private readonly adjustmentsService: AdjustmentsService,
     private readonly identifyRemandPeriodsService: IdentifyRemandPeriodsService,
     private readonly adjustmentsStoreService: AdjustmentsStoreService,
+    private readonly additionalDaysAwardedService: AdditionalDaysAwardedService,
   ) {}
 
   public entry: RequestHandler = async (req, res): Promise<void> => {
@@ -47,10 +49,28 @@ export default class AdjustmentRoutes {
   }
 
   public hub: RequestHandler = async (req, res): Promise<void> => {
-    const { caseloads, token } = res.locals.user
+    const { caseloads, token, username } = res.locals.user
     const { nomsId } = req.params
     const prisonerDetail = await this.prisonerService.getPrisonerDetail(nomsId, caseloads, token)
     const adjustments = await this.adjustmentsService.findByPerson(nomsId, token)
+    const message = req.flash('message')
+    if (!(message && message[0])) {
+      const startOfSentenceEnvelope = await this.prisonerService.getStartOfSentenceEnvelope(
+        prisonerDetail.bookingId,
+        token,
+      )
+      const intercept = await this.additionalDaysAwardedService.shouldIntercept(
+        req,
+        prisonerDetail,
+        adjustments,
+        startOfSentenceEnvelope,
+        username,
+      )
+
+      if (intercept.type !== 'NONE') {
+        return res.redirect(`/${nomsId}/additional-days/intercept`)
+      }
+    }
     const remandDecision = await this.identifyRemandPeriodsService.getRemandDecision(nomsId, token)
     let relevantRemand
     try {
@@ -58,7 +78,6 @@ export default class AdjustmentRoutes {
     } catch {
       // Nothing to do, remand review won't be displayed.
     }
-    const message = req.flash('message')
     return res.render('pages/adjustments/hub', {
       model: new AdjustmentsHubViewModel(
         prisonerDetail,
diff --git a/server/routes/index.ts b/server/routes/index.ts
index 4c67a732..d3e2747d 100644
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -16,6 +16,7 @@ export default function routes(service: Services): Router {
     service.adjustmentsService,
     service.identifyRemandPeriodsService,
     service.adjustmentsStoreService,
+    service.additionalDaysAwardedService,
   )
 
   const additionalDaysAwardedRoutes = new AdditionalDaysAwardedRoutes(
@@ -36,8 +37,9 @@ export default function routes(service: Services): Router {
   get('/:nomsId/review', adjustmentRoutes.review)
   post('/:nomsId/review', adjustmentRoutes.submitReview)
 
-  get('/:nomsId/ada/review', additionalDaysAwardedRoutes.review)
-  post('/:nomsId/ada/review', additionalDaysAwardedRoutes.approve)
+  get('/:nomsId/additional-days/intercept', additionalDaysAwardedRoutes.intercept)
+  get('/:nomsId/additional-days/review', additionalDaysAwardedRoutes.review)
+  post('/:nomsId/additional-days/review', additionalDaysAwardedRoutes.approve)
 
   get('/:nomsId/:adjustmentTypeUrl/view', adjustmentRoutes.view)
   get('/:nomsId/:adjustmentTypeUrl/remove/:id', adjustmentRoutes.remove)
diff --git a/server/services/additionalDaysApprovalStoreService.ts b/server/services/additionalDaysApprovalStoreService.ts
new file mode 100644
index 00000000..ee4cb57d
--- /dev/null
+++ b/server/services/additionalDaysApprovalStoreService.ts
@@ -0,0 +1,30 @@
+import { Request } from 'express'
+
+/**
+ * This is a temporary solution, to not keep showing the PADA screens, until we have a route into the service.
+ *
+ * Future solution ->
+ *
+ * 1. Link into adjustments services goes to start page, or at least a start URL.
+ * 2. Check the intercept logic on the start URL.
+ * 3. Remove intercept logic from adjustments hub route.
+ *
+ * This means we will only check the intercept the first time the user comes to our service, not when they're just navigating the adjustments hub.
+ *
+ * TODO ADJUST1-207
+ */
+export default class AdditionalDaysAwardedStoreService {
+  public approve(req: Request, nomsId: string): void {
+    if (!req.session.additionalDayApprovals) {
+      req.session.additionalDayApprovals = {}
+    }
+    req.session.additionalDayApprovals[nomsId] = new Date()
+  }
+
+  public get(req: Request, nomsId: string): Date {
+    if (!req.session.additionalDayApprovals) {
+      req.session.additionalDayApprovals = {}
+    }
+    return req.session.additionalDayApprovals[nomsId]
+  }
+}
diff --git a/server/services/additionalDaysAwardedService.test.ts b/server/services/additionalDaysAwardedService.test.ts
index d5a280b1..4f3bb0d6 100644
--- a/server/services/additionalDaysAwardedService.test.ts
+++ b/server/services/additionalDaysAwardedService.test.ts
@@ -1,16 +1,21 @@
 import nock from 'nock'
+import { Request } from 'express'
 import HmppsAuthClient from '../data/hmppsAuthClient'
 import AdditionalDaysAwardedService from './additionalDaysAwardedService'
 import TokenStore from '../data/tokenStore'
 import config from '../config'
 import { AdjudicationSearchResponse, IndividualAdjudication } from '../@types/adjudications/adjudicationTypes'
-import { AdasToReview } from '../@types/AdaTypes'
+import { AdaIntercept, AdasToReview } from '../@types/AdaTypes'
 import { Adjustment } from '../@types/adjustments/adjustmentsTypes'
+import { PrisonApiPrisoner } from '../@types/prisonApi/prisonClientTypes'
+import AdditionalDaysAwardedStoreService from './additionalDaysApprovalStoreService'
 
 jest.mock('../data/hmppsAuthClient')
+jest.mock('./additionalDaysApprovalStoreService')
 
 const hmppsAuthClient = new HmppsAuthClient({} as TokenStore) as jest.Mocked<HmppsAuthClient>
-const adaService = new AdditionalDaysAwardedService(hmppsAuthClient)
+const storeService = new AdditionalDaysAwardedStoreService() as jest.Mocked<AdditionalDaysAwardedStoreService>
+const adaService = new AdditionalDaysAwardedService(hmppsAuthClient, storeService)
 
 const token = 'token'
 
@@ -408,5 +413,116 @@ describe('Additional Days Added Service', () => {
         totalSuspended: 0,
       } as AdasToReview)
     })
+
+    it('Approve ADAs where a mix of consecutive and concurrent charges exist', async () => {
+      const nomsId = 'AA1234A'
+      const bookingId = 1234
+      adjudicationsApi
+        .get('/adjudications/AA1234A/adjudications?size=1000', '')
+        .reply(200, threeAdjudicationsSearchResponse)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525916', '').reply(200, adjudicationOne)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525917', '').reply(200, adjudicationTwoConsecutiveToOne)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525918', '').reply(200, adjudicationThreeConcurrentToOne)
+      adjustmentApi.get(`/adjustments?person=${nomsId}`).reply(200, adjustmentResponsesWithChargeNumber)
+      const startOfSentenceEnvelope = new Date('2023-01-01')
+      const request = {} as jest.Mocked<Request>
+      storeService.approve.mockReturnValue()
+      await adaService.approveAdjudications(
+        request,
+        {
+          offenderNo: nomsId,
+          bookingId,
+        } as PrisonApiPrisoner,
+        startOfSentenceEnvelope,
+        'username',
+        token,
+      )
+      expect(storeService.approve.mock.calls).toHaveLength(1)
+    })
+    it('Should intercept mix of concurrent consec', async () => {
+      const nomsId = 'AA1234A'
+      const bookingId = 1234
+      adjudicationsApi
+        .get('/adjudications/AA1234A/adjudications?size=1000', '')
+        .reply(200, threeAdjudicationsSearchResponse)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525916', '').reply(200, adjudicationOne)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525917', '').reply(200, adjudicationTwoConsecutiveToOne)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525918', '').reply(200, adjudicationThreeConcurrentToOne)
+      const startOfSentenceEnvelope = new Date('2023-01-01')
+      const request = {} as jest.Mocked<Request>
+      storeService.get.mockReturnValue(null)
+      const intercept = await adaService.shouldIntercept(
+        request,
+        {
+          offenderNo: nomsId,
+          bookingId,
+        } as PrisonApiPrisoner,
+        [],
+        startOfSentenceEnvelope,
+        'username',
+      )
+
+      expect(intercept).toEqual({
+        type: 'FIRST_TIME',
+        number: 1,
+      } as AdaIntercept)
+    })
+    it('Shouldnt intercept when already persisted in adjustment api', async () => {
+      const nomsId = 'AA1234A'
+      const bookingId = 1234
+      adjudicationsApi
+        .get('/adjudications/AA1234A/adjudications?size=1000', '')
+        .reply(200, threeAdjudicationsSearchResponse)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525916', '').reply(200, adjudicationOne)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525917', '').reply(200, adjudicationTwoConsecutiveToOne)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525918', '').reply(200, adjudicationThreeConcurrentToOne)
+      const startOfSentenceEnvelope = new Date('2023-01-01')
+      const request = {} as jest.Mocked<Request>
+      storeService.get.mockReturnValue(null)
+      const intercept = await adaService.shouldIntercept(
+        request,
+        {
+          offenderNo: nomsId,
+          bookingId,
+        } as PrisonApiPrisoner,
+        adjustmentResponsesWithChargeNumber,
+        startOfSentenceEnvelope,
+        'username',
+      )
+
+      expect(intercept).toEqual({
+        type: 'NONE',
+        number: 0,
+      } as AdaIntercept)
+    })
+
+    it('Shouldnt intercept when recently saved', async () => {
+      const nomsId = 'AA1234A'
+      const bookingId = 1234
+      adjudicationsApi
+        .get('/adjudications/AA1234A/adjudications?size=1000', '')
+        .reply(200, threeAdjudicationsSearchResponse)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525916', '').reply(200, adjudicationOne)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525917', '').reply(200, adjudicationTwoConsecutiveToOne)
+      adjudicationsApi.get('/adjudications/AA1234A/charge/1525918', '').reply(200, adjudicationThreeConcurrentToOne)
+      const startOfSentenceEnvelope = new Date('2023-01-01')
+      const request = {} as jest.Mocked<Request>
+      storeService.get.mockReturnValue(new Date())
+      const intercept = await adaService.shouldIntercept(
+        request,
+        {
+          offenderNo: nomsId,
+          bookingId,
+        } as PrisonApiPrisoner,
+        [],
+        startOfSentenceEnvelope,
+        'username',
+      )
+
+      expect(intercept).toEqual({
+        type: 'NONE',
+        number: 0,
+      } as AdaIntercept)
+    })
   })
 })
diff --git a/server/services/additionalDaysAwardedService.ts b/server/services/additionalDaysAwardedService.ts
index aacfdc71..024d1961 100644
--- a/server/services/additionalDaysAwardedService.ts
+++ b/server/services/additionalDaysAwardedService.ts
@@ -1,10 +1,13 @@
+import { Request } from 'express'
+import dayjs from 'dayjs'
 import AdjudicationClient from '../api/adjudicationsClient'
 import { AdjudicationSearchResponse, IndividualAdjudication, Sanction } from '../@types/adjudications/adjudicationTypes'
 import { HmppsAuthClient } from '../data'
-import { Ada, AdasByDateCharged, AdasToReview } from '../@types/AdaTypes'
+import { Ada, AdaIntercept, AdasByDateCharged, AdasToReview } from '../@types/AdaTypes'
 import AdjustmentsClient from '../api/adjustmentsClient'
 import { PrisonApiPrisoner } from '../@types/prisonApi/prisonClientTypes'
 import { Adjustment } from '../@types/adjustments/adjustmentsTypes'
+import AdditionalDaysAwardedStoreService from './additionalDaysApprovalStoreService'
 
 /* The adjudications status from NOMIS DB mapped to the adjudications API status are listed here temporarily to make it easier to implement the stories which use the NOMIS status
  * 'AS_AWARDED' = 'Activated as Awarded'
@@ -43,17 +46,22 @@ const AWARDED = 'AWARDED'
 const SUSPENDED = 'SUSPENDED'
 const QUASHED = 'QUASHED'
 const AWAITING_APPROVAL = 'AWAITING APPROVAL'
+const PROSPECTIVE = 'PROSPECTIVE'
 
 function deriveStatus(chargeId: number, sanction: Sanction, existingAdaChargeIds: number[]) {
   if (isSuspended(sanction)) return SUSPENDED
   if (sanction.status === 'Quashed' && existingAdaChargeIds.some(it => it === chargeId)) return AWAITING_APPROVAL
   if (sanction.status === 'Quashed') return QUASHED
   if (!isSuspended(sanction) && existingAdaChargeIds.some(it => it === chargeId)) return AWARDED
+  if (isProspectiveAda(sanction)) return PROSPECTIVE
   return AWAITING_APPROVAL
 }
 
 export default class AdditionalDaysAwardedService {
-  constructor(private readonly hmppsAuthClient: HmppsAuthClient) {}
+  constructor(
+    private readonly hmppsAuthClient: HmppsAuthClient,
+    private readonly additionalDaysAwardedStoreService: AdditionalDaysAwardedStoreService,
+  ) {}
 
   public async getAdasToReview(
     nomsId: string,
@@ -247,7 +255,63 @@ export default class AdditionalDaysAwardedService {
       .map(consecutiveAda => allAdas.find(sourceAda => sourceAda.sequence === consecutiveAda.consecutiveToSequence))
   }
 
+  public async shouldIntercept(
+    req: Request,
+    prisonerDetail: PrisonApiPrisoner,
+    adjustments: Adjustment[],
+    startOfSentenceEnvelope: Date,
+    username: string,
+  ): Promise<AdaIntercept> {
+    const lastApproved = this.additionalDaysAwardedStoreService.get(req, prisonerDetail.offenderNo)
+    if (lastApproved && dayjs(lastApproved).add(1, 'hour').isAfter(dayjs())) {
+      return { type: 'NONE', number: 0 }
+    }
+    const allAdaAdjustments = adjustments.filter(it => it.adjustmentType === 'ADDITIONAL_DAYS_AWARDED')
+    const anyUnlinkedAda = allAdaAdjustments.some(it => !it.additionalDaysAwarded?.adjudicationId?.length)
+    const anyLinkedAda = allAdaAdjustments.some(it => !!it.additionalDaysAwarded?.adjudicationId?.length)
+
+    const systemToken = await this.hmppsAuthClient.getSystemClientToken(username)
+    const adjudicationClient = new AdjudicationClient(systemToken)
+    const adjudications: AdjudicationSearchResponse = await adjudicationClient.getAdjudications(
+      prisonerDetail.offenderNo,
+    )
+    const individualAdjudications = await Promise.all(
+      adjudications.results.content.map(async it => {
+        return adjudicationClient.getAdjudication(prisonerDetail.offenderNo, it.adjudicationNumber)
+      }),
+    )
+    const existingAdaChargeIds = allAdaAdjustments
+      .filter(it => it.additionalDaysAwarded)
+      .flatMap(ada => ada.additionalDaysAwarded.adjudicationId)
+    const allAdas: Ada[] = this.getAdas(individualAdjudications, startOfSentenceEnvelope, existingAdaChargeIds)
+
+    const prospective: AdasByDateCharged[] = this.getAdasByDateCharged(allAdas, PROSPECTIVE)
+    const awaitingApproval: AdasByDateCharged[] = this.getAdasByDateCharged(allAdas, AWAITING_APPROVAL)
+    if (allAdaAdjustments.length && anyUnlinkedAda) {
+      return {
+        type: 'FIRST_TIME',
+        number: prospective.length + awaitingApproval.length,
+      }
+    }
+
+    if (prospective.length) {
+      return {
+        type: 'PADA',
+        number: prospective.length,
+      }
+    }
+
+    if (awaitingApproval.length) {
+      if (anyLinkedAda) {
+        return { type: 'UPDATE', number: awaitingApproval.length }
+      }
+      return { type: 'FIRST_TIME', number: awaitingApproval.length }
+    }
+    return { type: 'NONE', number: 0 }
+  }
+
   public async approveAdjudications(
+    req: Request,
     prisonerDetail: PrisonApiPrisoner,
     startOfSentenceEnvelope: Date,
     username: string,
@@ -271,7 +335,7 @@ export default class AdditionalDaysAwardedService {
     )
     const allAdas: Ada[] = this.getAdas(individualAdjudications, startOfSentenceEnvelope, existingAdaChargeIds)
 
-    const adas: AdasByDateCharged[] = this.getAdasByDateCharged(allAdas, AWARDED)
+    const adas: AdasByDateCharged[] = this.getAdasByDateCharged(allAdas, AWAITING_APPROVAL)
 
     const adjustments = adas.map(it => {
       return {
@@ -299,5 +363,7 @@ export default class AdditionalDaysAwardedService {
         return new AdjustmentsClient(token).create(it)
       }),
     )
+
+    this.additionalDaysAwardedStoreService.approve(req, prisonerDetail.offenderNo)
   }
 }
diff --git a/server/services/index.ts b/server/services/index.ts
index 1ea7732d..beb85a89 100644
--- a/server/services/index.ts
+++ b/server/services/index.ts
@@ -5,6 +5,7 @@ import IdentifyRemandPeriodsService from './identifyRemandPeriodsService'
 import PrisonerService from './prisonerService'
 import UserService from './userService'
 import AdditionalDaysAwardedService from './additionalDaysAwardedService'
+import AdditionalDaysAwardedStoreService from './additionalDaysApprovalStoreService'
 
 export const services = () => {
   const { hmppsAuthClient, applicationInfo } = dataAccess()
@@ -14,7 +15,11 @@ export const services = () => {
   const adjustmentsService = new AdjustmentsService()
   const identifyRemandPeriodsService = new IdentifyRemandPeriodsService()
   const adjustmentsStoreService = new AdjustmentsStoreService()
-  const additionalDaysAwardedService = new AdditionalDaysAwardedService(hmppsAuthClient)
+  const additionalDaysAwardedStoreService = new AdditionalDaysAwardedStoreService()
+  const additionalDaysAwardedService = new AdditionalDaysAwardedService(
+    hmppsAuthClient,
+    additionalDaysAwardedStoreService,
+  )
 
   return {
     applicationInfo,
@@ -24,6 +29,7 @@ export const services = () => {
     identifyRemandPeriodsService,
     adjustmentsStoreService,
     additionalDaysAwardedService,
+    additionalDaysAwardedStoreService,
   }
 }
 
diff --git a/server/views/pages/adjustments/ada/intercept.njk b/server/views/pages/adjustments/ada/intercept.njk
new file mode 100644
index 00000000..8ab9571f
--- /dev/null
+++ b/server/views/pages/adjustments/ada/intercept.njk
@@ -0,0 +1,53 @@
+{% extends "../../../partials/layout.njk" %}
+{% from "../../../macros/adaTable.njk" import adaTable %}
+{% from "govuk/components/button/macro.njk" import govukButton %}
+
+{% set pageTitle = applicationName + " - Review additional days awarded" %}
+{% set mainClasses = "app-container govuk-body" %}
+
+{% block content %}
+  <div class="moj-width-container">
+    <main class="govuk-main-wrapper" role="main">
+      <div class="govuk-grid-row">
+        <div class="govuk-grid-column-full">
+
+          <h1 class="govuk-heading-l">
+            <span class="govuk-caption-xl">Adjust release dates</span>
+              Review adjustment information
+          </h1>
+
+          <p class="govuk-body">
+            {% if model.intercept.type == 'FIRST_TIME' %} 
+            The first time you use the adjustments service, you need to check if the existing adjustment information from NOMIS is correct.
+            {% elif model.intercept.type == 'PADA' %}
+            There is a prospective ADA recorded for Joe Bloggs.
+            {% elif model.intercept.type == 'UPDATED' %}
+            Updates have been made to {{ model.prisonerDetail.firstName | title }}
+              {{ model.prisonerDetail.lastName | title }}'s adjustment information, which need to be approved.
+            {% endif %}
+          </p>
+          <article class="moj-ticket-panel govuk-!-margin-bottom-4 govuk-!-margin-left-2">
+            <section class="moj-ticket-panel__content moj-ticket-panel__content--blue moj-ticket-panel__content--inline">
+
+              {% if model.intercept.type == 'FIRST_TIME' %}
+                <h2 class="govuk-heading-m">Review ADA adjudication{% if model.intercept.number > 1%}s{% endif %}
+                </h2>
+                <p class="govuk-body">Review and approve adjudications where additional days have been awarded.</p>
+              {% elif model.intercept.type == 'PADA' %}
+                <h2 class="govuk-heading-m">Review PADA{% if model.intercept.number > 1%}s{% endif %}
+                </h2>
+                <p class="govuk-body">Review and approve the PADAs that are relevant to the current sentence.</p>
+              {% elif model.intercept.type == 'UPDATED' %}
+                <h2 class="govuk-heading-m">Review ADA updates</h2>
+                <p class="govuk-body">Review and approve the changes that have been made to the ADAs</p>
+              {% endif %}
+
+              <a class="govuk-link" href="/{{model.prisonerDetail.offenderNo}}/additional-days/review">Review</a>
+            </section>
+          </article>
+        </div>
+      </div>
+    </main>
+  </div>
+
+{% endblock %}
\ No newline at end of file

From 70c314928b453ded5dc2f92eef41ad6fd66086d8 Mon Sep 17 00:00:00 2001
From: Luke Harper <luke.harper@digital.justice.gov.uk>
Date: Wed, 27 Sep 2023 09:06:50 +0100
Subject: [PATCH 2/3] ADJUST1-164 adjudications mock for integration tests.

---
 cypress.config.ts                             |  2 ++
 feature.env                                   |  3 ++-
 integration_tests/e2e/rada.cy.ts              |  1 +
 integration_tests/e2e/remand.cy.ts            |  1 +
 .../mockApis/adjudicationsApi.ts              | 20 +++++++++++++++++++
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 integration_tests/mockApis/adjudicationsApi.ts

diff --git a/cypress.config.ts b/cypress.config.ts
index d2ca8b6f..9c199f07 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -5,6 +5,7 @@ import tokenVerification from './integration_tests/mockApis/tokenVerification'
 import prisonApi from './integration_tests/mockApis/prisonApi'
 import adjustmentsApi from './integration_tests/mockApis/adjustmentsApi'
 import identifyRemandApi from './integration_tests/mockApis/identifyRemandApi'
+import adjudicationsApi from './integration_tests/mockApis/adjudicationsApi'
 
 export default defineConfig({
   chromeWebSecurity: false,
@@ -28,6 +29,7 @@ export default defineConfig({
         ...prisonApi,
         ...adjustmentsApi,
         ...identifyRemandApi,
+        ...adjudicationsApi,
       })
     },
     baseUrl: 'http://localhost:3007',
diff --git a/feature.env b/feature.env
index c0d8f686..861486f9 100644
--- a/feature.env
+++ b/feature.env
@@ -12,4 +12,5 @@ DIGITAL_PRISON_SERVICES_URL=http://localhost:9091/dps
 CALCULATE_RELEASE_DATES_URL=http://localhost:9091/crd
 IDENTIFY_REMAND_PERIODS_URL=http://localhost:9091/identify-remand
 IDENTIFY_REMAND_PERIODS_API_URL=http://localhost:9091/identify-remand-api
-ADJUSTMENTS_API_URL=http://localhost:9091/adjustments-api
\ No newline at end of file
+ADJUSTMENTS_API_URL=http://localhost:9091/adjustments-api
+ADJUDICATIONS_API_URL=http://localhost:9091/adjudications-api
\ No newline at end of file
diff --git a/integration_tests/e2e/rada.cy.ts b/integration_tests/e2e/rada.cy.ts
index db4600d0..757fa34f 100644
--- a/integration_tests/e2e/rada.cy.ts
+++ b/integration_tests/e2e/rada.cy.ts
@@ -20,6 +20,7 @@ context('Enter a RADA', () => {
     cy.task('stubUpdateAdjustment')
     cy.task('stubRemoveAdjustment')
     cy.task('stubGetRemandDecision')
+    cy.task('stubEmptySearchAdjudications')
   })
 
   it('Add a RADA', () => {
diff --git a/integration_tests/e2e/remand.cy.ts b/integration_tests/e2e/remand.cy.ts
index 0237b055..c4d94b0c 100644
--- a/integration_tests/e2e/remand.cy.ts
+++ b/integration_tests/e2e/remand.cy.ts
@@ -10,6 +10,7 @@ context('Enter a RADA', () => {
     cy.task('stubGetAdjustments')
     cy.task('stubGetRelevantRemand')
     cy.task('stubGetRemandDecision')
+    cy.task('stubEmptySearchAdjudications')
   })
 
   it('Enter a RADA', () => {
diff --git a/integration_tests/mockApis/adjudicationsApi.ts b/integration_tests/mockApis/adjudicationsApi.ts
new file mode 100644
index 00000000..32e8ed45
--- /dev/null
+++ b/integration_tests/mockApis/adjudicationsApi.ts
@@ -0,0 +1,20 @@
+import { SuperAgentRequest } from 'superagent'
+import { stubFor } from './wiremock'
+
+export default {
+  stubEmptySearchAdjudications: (): SuperAgentRequest => {
+    return stubFor({
+      request: {
+        method: 'GET',
+        urlPattern: '/adjudications-api/adjudications/A1234AB/adjudications\\?size=1000',
+      },
+      response: {
+        status: 200,
+        headers: { 'Content-Type': 'application/json;charset=UTF-8' },
+        jsonBody: {
+          results: [],
+        },
+      },
+    })
+  },
+}

From f770bd018e2434957bf8f4958ef1f566f5fede45 Mon Sep 17 00:00:00 2001
From: Luke Harper <luke.harper@digital.justice.gov.uk>
Date: Wed, 27 Sep 2023 11:25:51 +0100
Subject: [PATCH 3/3] ADJUST1-164 fixing tests.

---
 integration_tests/e2e/rada.cy.ts              |   4 +-
 integration_tests/e2e/remand.cy.ts            |   4 +-
 integration_tests/mockApis/adjudications.ts   | 325 ++++++++++++++++++
 .../mockApis/adjudicationsApi.ts              | 129 ++++++-
 integration_tests/mockApis/adjustmentsApi.ts  |   6 +-
 integration_tests/mockApis/prisonApi.ts       |  36 ++
 6 files changed, 497 insertions(+), 7 deletions(-)
 create mode 100644 integration_tests/mockApis/adjudications.ts

diff --git a/integration_tests/e2e/rada.cy.ts b/integration_tests/e2e/rada.cy.ts
index 757fa34f..f5536f5e 100644
--- a/integration_tests/e2e/rada.cy.ts
+++ b/integration_tests/e2e/rada.cy.ts
@@ -20,7 +20,9 @@ context('Enter a RADA', () => {
     cy.task('stubUpdateAdjustment')
     cy.task('stubRemoveAdjustment')
     cy.task('stubGetRemandDecision')
-    cy.task('stubEmptySearchAdjudications')
+    cy.task('stubSearchAdjudications')
+    cy.task('stubIndividualAdjudications')
+    cy.task('stubGetSentencesAndOffences')
   })
 
   it('Add a RADA', () => {
diff --git a/integration_tests/e2e/remand.cy.ts b/integration_tests/e2e/remand.cy.ts
index c4d94b0c..b0a4593f 100644
--- a/integration_tests/e2e/remand.cy.ts
+++ b/integration_tests/e2e/remand.cy.ts
@@ -10,7 +10,9 @@ context('Enter a RADA', () => {
     cy.task('stubGetAdjustments')
     cy.task('stubGetRelevantRemand')
     cy.task('stubGetRemandDecision')
-    cy.task('stubEmptySearchAdjudications')
+    cy.task('stubSearchAdjudications')
+    cy.task('stubIndividualAdjudications')
+    cy.task('stubGetSentencesAndOffences')
   })
 
   it('Enter a RADA', () => {
diff --git a/integration_tests/mockApis/adjudications.ts b/integration_tests/mockApis/adjudications.ts
new file mode 100644
index 00000000..c3949f1f
--- /dev/null
+++ b/integration_tests/mockApis/adjudications.ts
@@ -0,0 +1,325 @@
+const adjudications = [
+  {
+    adjudicationNumber: 1296861,
+    incidentTime: '2016-04-15T15:45:00',
+    establishment: 'Haverigg (HMP)',
+    interiorLocation: 'Fairfield Wing',
+    incidentDetails:
+      'WauNpDdByswUvzOnDbnUhmrcpGIVMGKvDgtCTRJRuhYzfIJfGbZhGEhLgCiCKowBZpWORYFyWauNpDdByswUvzOnDbnUhmrcpGIVMGKvDgtCTRJRuhYzfIJfGbZhGEhLgCiCKowBZpWORYF',
+    reportNumber: 1278212,
+    reportType: "Governor's Report",
+    reporterFirstName: 'YDFISOOPHER',
+    reporterLastName: 'FATALIE',
+    reportTime: '2016-04-16T13:21:00',
+    hearings: [
+      {
+        oicHearingId: 1697175,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-04-30T14:56:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'zvWAzvW',
+        comment: 'WW',
+        results: [],
+      },
+      {
+        oicHearingId: 1685096,
+        hearingType: "Governor's Hearing Adult",
+        hearingTime: '2016-04-18T09:00:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        heardByFirstName: 'BESSEYNU',
+        heardByLastName: 'YASMEXIA',
+        comment: 'JIJJIJ',
+        results: [],
+      },
+      {
+        oicHearingId: 1703902,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-05-12T09:03:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Scafell Wing',
+        otherRepresentatives: 'ASUzASU',
+        results: [
+          {
+            oicOffenceCode: '51:1',
+            offenceType: 'Prison Rule 51',
+            offenceDescription: 'Commits any assault',
+            plea: 'Guilty',
+            finding: 'Charge Proved',
+            sanctions: [
+              {
+                sanctionType: 'Additional Days Added',
+                sanctionDays: 26,
+                effectiveDate: '2016-05-12T00:00:00',
+                status: 'Immediate',
+                statusDate: '2016-05-12T00:00:00',
+                comment: 'zBgdbgawxpEfaQloXDBjlTzBgdbgawxpEfaQloXDBjl',
+                sanctionSeq: 3,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  {
+    adjudicationNumber: 1296857,
+    incidentTime: '2016-04-15T15:45:00',
+    establishment: 'Haverigg (HMP)',
+    interiorLocation: 'Fairfield Wing',
+    incidentDetails:
+      'bpELIrswJXbUHQGgLFUBqiQBsWAKRCUsuFZdlfNPoITBlEDfuVceoFATMEbpELIrswJXbUHQGgLFUBqiQBsWAKRCUsuFZdlfNPoITBlEDfuVceoFATME',
+    reportNumber: 1278208,
+    reportType: "Governor's Report",
+    reporterFirstName: 'YDFISOOPHER',
+    reporterLastName: 'FATALIE',
+    reportTime: '2016-04-16T13:13:00',
+    hearings: [
+      {
+        oicHearingId: 1697174,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-04-22T14:55:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'KXIAKXI',
+        comment: 'ZZ',
+        results: [],
+      },
+      {
+        oicHearingId: 1685088,
+        hearingType: "Governor's Hearing Adult",
+        hearingTime: '2016-04-18T09:00:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        heardByFirstName: 'BESSEYNU',
+        heardByLastName: 'YASMEXIA',
+        comment: 'BXABXA',
+        results: [],
+      },
+      {
+        oicHearingId: 1703903,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-05-12T09:30:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'mOKxmOK',
+        results: [
+          {
+            oicOffenceCode: '51:22',
+            offenceType: 'Prison Rule 51',
+            offenceDescription: 'Disobeys any lawful order',
+            plea: 'Guilty',
+            finding: 'Charge Proved',
+            sanctions: [
+              {
+                sanctionType: 'Additional Days Added',
+                sanctionDays: 14,
+                effectiveDate: '2016-05-12T00:00:00',
+                status: 'Immediate',
+                statusDate: '2016-05-12T00:00:00',
+                comment: 'JBweLvAMNKvOVIPBqsxnNWVRJBweLvAMNKvOVIPBqsxnNWV',
+                sanctionSeq: 4,
+                consecutiveSanctionSeq: 5,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  {
+    adjudicationNumber: 1296839,
+    incidentTime: '2016-04-15T15:45:00',
+    establishment: 'Haverigg (HMP)',
+    interiorLocation: 'Fairfield Wing',
+    incidentDetails: 'cFlxuiADszvlyKvbInisOxGtZHIUPMCaJpJqbXgGEgPZdcFlxuiADszvlyKvbInisOxGtZHIUPMCaJpJqbXgGEgPZd',
+    reportNumber: 1278189,
+    reportType: "Governor's Report",
+    reporterFirstName: 'DILBNELIWA',
+    reporterLastName: 'LINDAYLA',
+    reportTime: '2016-04-16T12:40:00',
+    hearings: [
+      {
+        oicHearingId: 1697167,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-04-22T14:52:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'WrfyWrf',
+        comment: 'UU',
+        results: [],
+      },
+      {
+        oicHearingId: 1685041,
+        hearingType: "Governor's Hearing Adult",
+        hearingTime: '2016-04-18T09:00:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        heardByFirstName: 'BESSEYNU',
+        heardByLastName: 'YASMEXIA',
+        comment: 'jiZjiZ',
+        results: [],
+      },
+      {
+        oicHearingId: 1703908,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-05-12T09:03:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'BnmLBnm',
+        results: [
+          {
+            oicOffenceCode: '51:5',
+            offenceType: 'Prison Rule 51',
+            offenceDescription:
+              'Intentionally endangers the health or personal safety of others or, by his conduct, is reckless whether such health or personal safety is endangered',
+            plea: 'Guilty',
+            finding: 'Charge Proved',
+            sanctions: [
+              {
+                sanctionType: 'Additional Days Added',
+                sanctionDays: 26,
+                effectiveDate: '2016-05-12T00:00:00',
+                status: 'Immediate',
+                statusDate: '2016-05-12T00:00:00',
+                comment: 'spqtPUUngnAHwTgoGHyKtirhspqtPUUngnAHwTgoGHyKtirh',
+                sanctionSeq: 1,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  {
+    adjudicationNumber: 1296855,
+    incidentTime: '2016-04-15T15:45:00',
+    establishment: 'Haverigg (HMP)',
+    interiorLocation: 'Fairfield Wing',
+    incidentDetails:
+      'rzLlfWjHMTnVxqcxOGazFXZgdwHmpHFqRDsjYYXPPkAuSyhqHwZQfTRVvSYUdpxeXgFVOANeqauYVGWktgDUaWLNVQEBNUtmQFQhyuUxXUoBanGozrzLlfWjHMTnVxqcxOGazFXZgdwHmpHFqRDsjYYXPPkAuSyhqHwZQfTRVvSYUdpxeXgFVOANeqauYVGWktgDUaWLNVQEBNUtmQFQhyuUxXUoBanGoz',
+    reportNumber: 1278206,
+    reportType: "Governor's Report",
+    reporterFirstName: 'AJNNECE',
+    reporterLastName: 'CAROLD',
+    reportTime: '2016-04-16T13:01:00',
+    hearings: [
+      {
+        oicHearingId: 1697173,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-04-22T14:54:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'RwRdRwR',
+        comment: 'ee',
+        results: [],
+      },
+      {
+        oicHearingId: 1685081,
+        hearingType: "Governor's Hearing Adult",
+        hearingTime: '2016-04-18T09:00:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        heardByFirstName: 'BESSEYNU',
+        heardByLastName: 'YASMEXIA',
+        comment: 'QVcQVc',
+        results: [],
+      },
+      {
+        oicHearingId: 1703904,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-05-12T09:30:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'qZhbqZh',
+        results: [
+          {
+            oicOffenceCode: '51:1',
+            offenceType: 'Prison Rule 51',
+            offenceDescription: 'Commits any assault',
+            plea: 'Guilty',
+            finding: 'Charge Proved',
+            sanctions: [
+              {
+                sanctionType: 'Additional Days Added',
+                sanctionDays: 26,
+                effectiveDate: '2016-05-12T00:00:00',
+                status: 'Immediate',
+                statusDate: '2016-05-12T00:00:00',
+                comment: 'ibuvIjhvEfItAKeHtEPibuvIjhvEfItAKeHtEP',
+                sanctionSeq: 2,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  {
+    adjudicationNumber: 1296846,
+    incidentTime: '2016-04-15T15:45:00',
+    establishment: 'Haverigg (HMP)',
+    interiorLocation: 'Fairfield Wing',
+    incidentDetails:
+      'JxIPJubhRvBMuSKvCdBpEcZhchNUySsGECoQDvwexcVkbAWZKItlJxIPJubhRvBMuSKvCdBpEcZhchNUySsGECoQDvwexcVkbAWZKItl',
+    reportNumber: 1278197,
+    reportType: "Governor's Report",
+    reporterFirstName: 'DILBNELIWA',
+    reporterLastName: 'LINDAYLA',
+    reportTime: '2016-04-16T12:50:00',
+    hearings: [
+      {
+        oicHearingId: 1697172,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-04-22T14:54:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'gwdugwd',
+        comment: 'KK',
+        results: [],
+      },
+      {
+        oicHearingId: 1685061,
+        hearingType: "Governor's Hearing Adult",
+        hearingTime: '2016-04-18T09:00:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        heardByFirstName: 'BESSEYNU',
+        heardByLastName: 'YASMEXIA',
+        comment: 'ffbffb',
+        results: [],
+      },
+      {
+        oicHearingId: 1703906,
+        hearingType: 'Independent Adjudicator Hearing Adult',
+        hearingTime: '2016-05-12T09:30:00',
+        establishment: 'Haverigg (HMP)',
+        location: 'Adjudication Room',
+        otherRepresentatives: 'UZCCUZC',
+        results: [
+          {
+            oicOffenceCode: '51:1',
+            offenceType: 'Prison Rule 51',
+            offenceDescription: 'Commits any assault',
+            plea: 'Guilty',
+            finding: 'Charge Proved',
+            sanctions: [
+              {
+                sanctionType: 'Additional Days Added',
+                sanctionDays: 26,
+                effectiveDate: '2016-05-12T00:00:00',
+                status: 'Immediate',
+                statusDate: '2016-05-12T00:00:00',
+                comment: 'xREMNsMOQvgrZbsnGtEZoxREMNsMOQvgrZbsnGtEZo',
+                sanctionSeq: 5,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+
+export default adjudications
diff --git a/integration_tests/mockApis/adjudicationsApi.ts b/integration_tests/mockApis/adjudicationsApi.ts
index 32e8ed45..627ebb76 100644
--- a/integration_tests/mockApis/adjudicationsApi.ts
+++ b/integration_tests/mockApis/adjudicationsApi.ts
@@ -1,8 +1,9 @@
 import { SuperAgentRequest } from 'superagent'
 import { stubFor } from './wiremock'
+import adjudications from './adjudications'
 
 export default {
-  stubEmptySearchAdjudications: (): SuperAgentRequest => {
+  stubSearchAdjudications: (): SuperAgentRequest => {
     return stubFor({
       request: {
         method: 'GET',
@@ -12,9 +13,133 @@ export default {
         status: 200,
         headers: { 'Content-Type': 'application/json;charset=UTF-8' },
         jsonBody: {
-          results: [],
+          results: {
+            content: [
+              {
+                adjudicationNumber: 1296861,
+                reportTime: '2016-04-16T13:21:00',
+                agencyIncidentId: 1278212,
+                agencyId: 'HVI',
+                partySeq: 1,
+                adjudicationCharges: [
+                  {
+                    oicChargeId: '1296861/1',
+                    offenceCode: '51:1',
+                    offenceDescription: 'Commits any assault',
+                    findingCode: 'PROVED',
+                  },
+                ],
+              },
+              {
+                adjudicationNumber: 1296857,
+                reportTime: '2016-04-16T13:13:00',
+                agencyIncidentId: 1278208,
+                agencyId: 'HVI',
+                partySeq: 1,
+                adjudicationCharges: [
+                  {
+                    oicChargeId: '1296857/1',
+                    offenceCode: '51:22',
+                    offenceDescription: 'Disobeys any lawful order',
+                    findingCode: 'PROVED',
+                  },
+                ],
+              },
+              {
+                adjudicationNumber: 1296855,
+                reportTime: '2016-04-16T13:01:00',
+                agencyIncidentId: 1278206,
+                agencyId: 'HVI',
+                partySeq: 1,
+                adjudicationCharges: [
+                  {
+                    oicChargeId: '1296855/1',
+                    offenceCode: '51:1',
+                    offenceDescription: 'Commits any assault',
+                    findingCode: 'PROVED',
+                  },
+                ],
+              },
+              {
+                adjudicationNumber: 1296846,
+                reportTime: '2016-04-16T12:50:00',
+                agencyIncidentId: 1278197,
+                agencyId: 'HVI',
+                partySeq: 1,
+                adjudicationCharges: [
+                  {
+                    oicChargeId: '1296846/1',
+                    offenceCode: '51:1',
+                    offenceDescription: 'Commits any assault',
+                    findingCode: 'PROVED',
+                  },
+                ],
+              },
+              {
+                adjudicationNumber: 1296839,
+                reportTime: '2016-04-16T12:40:00',
+                agencyIncidentId: 1278189,
+                agencyId: 'HVI',
+                partySeq: 1,
+                adjudicationCharges: [
+                  {
+                    oicChargeId: '1296839/1',
+                    offenceCode: '51:5',
+                    offenceDescription:
+                      'Intentionally endangers the health or personal safety of others or, by his conduct, is reckless whether such health or personal safety is endangered',
+                    findingCode: 'PROVED',
+                  },
+                ],
+              },
+            ],
+            pageable: {
+              pageNumber: 0,
+              pageSize: 1000,
+              sort: { empty: true, unsorted: true, sorted: false },
+              offset: 0,
+              paged: true,
+              unpaged: false,
+            },
+            totalPages: 1,
+            totalElements: 5,
+            last: true,
+            size: 1000,
+            number: 0,
+            sort: { empty: true, unsorted: true, sorted: false },
+            first: true,
+            numberOfElements: 5,
+            empty: false,
+          },
+          offences: [
+            { id: '1', code: '51:1', description: 'Commits any assault' },
+            { id: '48', code: '51:22', description: 'Disobeys any lawful order' },
+            {
+              id: '6',
+              code: '51:5',
+              description:
+                'Intentionally endangers the health or personal safety of others or, by his conduct, is reckless whether such health or personal safety is endangered',
+            },
+          ],
+          agencies: [{ agencyId: 'HVI', description: 'Haverigg (HMP)', active: true }],
         },
       },
     })
   },
+  stubIndividualAdjudications: (): Promise<unknown> => {
+    return Promise.all(
+      adjudications.map(it => {
+        return stubFor({
+          request: {
+            method: 'GET',
+            urlPattern: `/adjudications-api/adjudications/A1234AB/charge/${it.adjudicationNumber}`,
+          },
+          response: {
+            status: 200,
+            headers: { 'Content-Type': 'application/json;charset=UTF-8' },
+            jsonBody: it,
+          },
+        })
+      }),
+    )
+  },
 }
diff --git a/integration_tests/mockApis/adjustmentsApi.ts b/integration_tests/mockApis/adjustmentsApi.ts
index 771f1560..866bdc77 100644
--- a/integration_tests/mockApis/adjustmentsApi.ts
+++ b/integration_tests/mockApis/adjustmentsApi.ts
@@ -25,14 +25,14 @@ export default {
           },
           {
             id: '5c618eb1-dcc9-4959-827e-27e6cd5fedf6',
-            bookingId: 1204935,
-            sentenceSequence: null,
             person: 'A1234AB',
+            bookingId: 1204935,
             adjustmentType: 'ADDITIONAL_DAYS_AWARDED',
-            toDate: null,
             fromDate: '2023-06-01',
             days: 40,
+            prisonId: 'KMI',
             prisonName: 'Leeds',
+            additionalDaysAwarded: { adjudicationId: [1296861, 1296857, 1296855, 1296846, 1296839] },
           },
           {
             id: '4c3c057c-896d-4793-9022-f3001e209a36',
diff --git a/integration_tests/mockApis/prisonApi.ts b/integration_tests/mockApis/prisonApi.ts
index d4ebe316..2489c8fa 100644
--- a/integration_tests/mockApis/prisonApi.ts
+++ b/integration_tests/mockApis/prisonApi.ts
@@ -39,4 +39,40 @@ export default {
       },
     })
   },
+  stubGetSentencesAndOffences: (): SuperAgentRequest => {
+    return stubFor({
+      request: {
+        method: 'GET',
+        urlPattern: '/prison-api/api/offender-sentences/booking/1234/sentences-and-offences',
+      },
+      response: {
+        status: 200,
+        headers: { 'Content-Type': 'application/json;charset=UTF-8' },
+        jsonBody: [
+          {
+            terms: [
+              {
+                years: 3,
+              },
+            ],
+            sentenceCalculationType: 'ADIMP',
+            sentenceTypeDescription: 'SDS Standard Sentence',
+            caseSequence: 1,
+            lineSequence: 1,
+            caseReference: 'ABC123',
+            sentenceSequence: 1,
+            sentenceStatus: 'A',
+            offences: [
+              {
+                offenceEndDate: '2021-02-03',
+                offenceCode: 'abc',
+                offenderChargeId: 111,
+                offenceDescription: 'Doing a crime',
+              },
+            ],
+          },
+        ],
+      },
+    })
+  },
 }