Merge branch 'main' into BICAWS7-3076-add-resolved-date-range-to-case…

…-list-query
ministryofjustice · Sep 3, 2024 · adb2261 · adb2261
2 parents 71a5c2c + e6d3dbb
commit adb2261
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -106,12 +106,14 @@ const extractSearchParamsFromQuery = (query: ParsedUrlQuery, currentUser: User):
     caseState === "Resolved" && !currentUser.hasAccessTo[Permission.ListAllCases] ? currentUser.username : null
   const courtDateRange = caseAges || dateRange
   const resolvedDateRange = validateDateRange({ from: query.resolvedFrom, to: query.resolvedTo })
-
+  const asn = validateQueryParams(query.asn) ? sanitise(query.asn) : null
+
   return {
     ...(defendantName && { defendantName: defendantName }),
     ...(courtName && { courtName: courtName }),
     ...(reasonCodes && { reasonCodes: reasonCodes }),
     ...(ptiurn && { ptiurn }),
+    ...(asn && { asn }),
     reason,
     maxPageItems: validateQueryParams(query.maxPageItems) ? +Number(query.maxPageItems) : defaults.maxPageItems,
     page: validateQueryParams(query.page) ? +Number(query.page) : 1,

diff --git a/src/services/listCourtCases.ts b/src/services/listCourtCases.ts
@@ -30,6 +30,7 @@ const listCourtCases = async (
     reasonCodes,
     resolvedByUsername,
     resolvedDateRange
+    asn
   }: CaseListQueryParams,
   user: User
 ): PromiseResult<ListCourtCaseResult> => {
@@ -104,6 +105,10 @@ const listCourtCases = async (
     query.andWhere(ptiurnLike)
   }
 
+  if (asn) {
+    query.andWhere({ asn: ILike(`%${asn}%`) })
+  }
+
   if (reasonCodes?.length) {
     query.andWhere(
       new Brackets((qb) => {

diff --git a/src/types/CaseListQueryParams.ts b/src/types/CaseListQueryParams.ts
@@ -41,4 +41,5 @@ export type CaseListQueryParams = {
   reasonCodes?: string[]
   resolvedByUsername?: string
   resolvedDateRange?: DateRange
+  asn?: string
 }
diff --git a/test/services/listCourtCases/listCourtCases.integration.test.ts b/test/services/listCourtCases/listCourtCases.integration.test.ts
@@ -482,6 +482,35 @@ describe("listCourtCases", () => {
     })
   })
 
+  describe("search by asn", () => {
+    it("Should list cases when there is a case insensitive match", async () => {
+      const asnToInclude = "1101ZD0100000448754K"
+      const asnToIncludeWithPartialMatch = "1101ZD0100000448754J"
+      const asnToNotInclude = "AAAAAAAAAAAAAAAAAAA"
+
+      await insertCourtCasesWithFields([
+        { asn: asnToInclude },
+        { asn: asnToIncludeWithPartialMatch },
+        { asn: asnToNotInclude }
+      ])
+
+      let result = await listCourtCases(dataSource, { maxPageItems: 100, asn: "1101ZD0100000448754K" }, testUser)
+      expect(isError(result)).toBe(false)
+      let { result: cases } = result as ListCourtCaseResult
+
+      expect(cases).toHaveLength(1)
+      expect(cases[0].asn).toStrictEqual(asnToInclude)
+
+      result = await listCourtCases(dataSource, { maxPageItems: 100, asn: "1101ZD0100000448754" }, testUser)
+      expect(isError(result)).toBe(false)
+      cases = (result as ListCourtCaseResult).result
+
+      expect(cases).toHaveLength(2)
+      expect(cases[0].asn).toStrictEqual(asnToInclude)
+      expect(cases[1].asn).toStrictEqual(asnToIncludeWithPartialMatch)
+    })
+  })
+
   describe("search by ptiurn", () => {
     it("Should list cases when there is a case insensitive match", async () => {
       const ptiurnToInclude = "01ZD0303908"
@@ -510,7 +539,6 @@ describe("listCourtCases", () => {
       expect(cases[1].ptiurn).toStrictEqual(ptiurnToIncludeWithPartialMatch)
     })
   })
-
   describe("search by reason", () => {
     it("Should list cases when there is a case insensitive match in triggers or exceptions", async () => {
       await insertCourtCasesWithFields(Array.from({ length: 4 }, () => ({ orgForPoliceFilter: orgCode })))