Extract out duplicated function

src/features/CourtCaseDetails/Tabs/Panels/Offences/Offence/OffenceMatching.tsx

@@ -7,7 +7,7 @@ import { useCourtCase } from "context/CourtCaseContext"
 import { useCurrentUser } from "context/CurrentUserContext"
 import { Exception } from "types/exceptions"
 import getExceptionMessage from "utils/offenceMatcher/getExceptionMessage"
-import { getOffenceMatchingException } from "utils/offenceMatcher/getOffenceMatchingException"
+import getOffenceMatchingException from "utils/offenceMatcher/getOffenceMatchingException"
 import isEnabled from "utils/offenceMatcher/isEnabled"
 import offenceMatchingExceptions from "utils/offenceMatcher/offenceMatchingExceptions"
 import findCandidates from "../../../../../../utils/offenceMatcher/findCandidates"

src/utils/offenceMatcher/getOffenceMatchingException.test.ts

@@ -1,39 +1,8 @@
-import { Exception } from "types/exceptions"
-import {
-  getOffenceMatchingException,
-  GetOffenceMatchingExceptionResult,
-  getOffenceMatchingExceptions
-} from "./getOffenceMatchingException"
 import ExceptionCode from "@moj-bichard7-developers/bichard7-next-data/dist/types/ExceptionCode"
+import type { Exception } from "types/exceptions"
 import { ExceptionBadgeType } from "utils/exceptions/exceptionBadgeType"
-
-describe("getOffenceMatchingExceptions", () => {
-  it("returns an empty array when given no exceptions", () => {
-    const result = getOffenceMatchingExceptions([])
-    expect(result).toEqual([])
-  })
-
-  it("returns an empty array when given exception that is not in array of valid values", () => {
-    const exception: Exception = { code: ExceptionCode.HO100304, path: ["test"] }
-    const result = getOffenceMatchingExceptions([exception])
-    expect(result).toEqual([])
-  })
-
-  it("returns exception when given exception that is in array of valid values", () => {
-    const exception: Exception = { code: ExceptionCode.HO100310, path: ["test"] }
-    const result = getOffenceMatchingExceptions([exception])
-    expect(result).toEqual([exception])
-  })
-
-  it("returns exception when given multiple exceptions and exception is in array of valid values", () => {
-    const exceptions: Exception[] = [
-      { code: ExceptionCode.HO100304, path: ["test"] },
-      { code: ExceptionCode.HO100310, path: ["test"] }
-    ]
-    const result = getOffenceMatchingExceptions(exceptions)
-    expect(result).toEqual([exceptions[1]])
-  })
-})
+import type { GetOffenceMatchingExceptionResult } from "./getOffenceMatchingException"
+import getOffenceMatchingException from "./getOffenceMatchingException"
 
 describe("getOffenceMatchingException", () => {
   it("returns undefined when given an empty array", () => {

src/utils/offenceMatcher/getOffenceMatchingException.ts

@@ -14,10 +14,6 @@ type GetOffenceMatchingExceptionResult =
     }
   | undefined
 
-const getOffenceMatchingExceptions = (exceptions: Exception[]): Exception[] => {
-  return exceptions.filter((exception) => offenceMatchingExceptions.offenceNotMatched.includes(exception.code))
-}
-
 const getOffenceMatchingException = (
   exceptions: Exception[],
   offenceIndex: number
@@ -48,5 +44,5 @@ const getOffenceMatchingException = (
   }
 }
 
-export { getOffenceMatchingException, getOffenceMatchingExceptions }
+export default getOffenceMatchingException
 export type { GetOffenceMatchingExceptionResult }

src/utils/offenceMatcher/getOffenceMatchingExceptions.test.ts

@@ -0,0 +1,31 @@
+import ExceptionCode from "@moj-bichard7-developers/bichard7-next-data/dist/types/ExceptionCode"
+import type { Exception } from "types/exceptions"
+import getOffenceMatchingExceptions from "./getOffenceMatchingExceptions"
+
+describe("getOffenceMatchingExceptions", () => {
+  it("returns an empty array when given no exceptions", () => {
+    const result = getOffenceMatchingExceptions([])
+    expect(result).toEqual([])
+  })
+
+  it("returns an empty array when given exception that is not in array of valid values", () => {
+    const exception: Exception = { code: ExceptionCode.HO100312, path: ["test"] }
+    const result = getOffenceMatchingExceptions([exception])
+    expect(result).toEqual([])
+  })
+
+  it("returns exception when given exception that is in array of valid values", () => {
+    const exception: Exception = { code: ExceptionCode.HO100310, path: ["test"] }
+    const result = getOffenceMatchingExceptions([exception])
+    expect(result).toEqual([exception])
+  })
+
+  it("returns exception when given multiple exceptions and exception is in array of valid values", () => {
+    const exceptions: Exception[] = [
+      { code: ExceptionCode.HO100310, path: ["test"] },
+      { code: ExceptionCode.HO100312, path: ["test"] }
+    ]
+    const result = getOffenceMatchingExceptions(exceptions)
+    expect(result).toEqual([exceptions[0]])
+  })
+})

src/utils/offenceMatcher/getOffenceMatchingExceptions.ts

@@ -0,0 +1,7 @@
+import type { Exception } from "types/exceptions"
+import offenceMatchingExceptions from "./offenceMatchingExceptions"
+
+const getOffenceMatchingExceptions = (exceptions: Exception[]): Exception[] =>
+  exceptions.filter((exception) => offenceMatchingExceptions.offenceNotMatched.includes(exception.code))
+
+export default getOffenceMatchingExceptions

src/utils/offenceMatcher/hasOffenceMatchingExceptions.test.ts

@@ -1,6 +1,6 @@
 import ExceptionCode from "@moj-bichard7-developers/bichard7-next-data/dist/types/ExceptionCode"
-import hasOffenceMatchingExceptions, { filterOffenceMatchingException } from "./hasOffenceMatchingExceptions"
 import { Exception } from "types/exceptions"
+import hasOffenceMatchingExceptions from "./hasOffenceMatchingExceptions"
 
 describe("hasOffenceMatchingExceptions", () => {
   it("returns false when given empty array", () => {
@@ -29,31 +29,3 @@ describe("hasOffenceMatchingExceptions", () => {
     expect(result).toBe(true)
   })
 })
-
-describe("filterOffenceMatchingException", () => {
-  it("returns an empty array when given no exceptions", () => {
-    const result = filterOffenceMatchingException([])
-    expect(result).toEqual([])
-  })
-
-  it("returns an empty array when given exception that is not in array of valid values", () => {
-    const exception: Exception = { code: ExceptionCode.HO100312, path: ["test"] }
-    const result = filterOffenceMatchingException([exception])
-    expect(result).toEqual([])
-  })
-
-  it("returns exception when given exception that is in array of valid values", () => {
-    const exception: Exception = { code: ExceptionCode.HO100310, path: ["test"] }
-    const result = filterOffenceMatchingException([exception])
-    expect(result).toEqual([exception])
-  })
-
-  it("returns exception when given multiple exceptions and exception is in array of valid values", () => {
-    const exceptions: Exception[] = [
-      { code: ExceptionCode.HO100310, path: ["test"] },
-      { code: ExceptionCode.HO100312, path: ["test"] }
-    ]
-    const result = filterOffenceMatchingException(exceptions)
-    expect(result).toEqual([exceptions[0]])
-  })
-})

src/utils/offenceMatcher/hasOffenceMatchingExceptions.ts

@@ -1,10 +1,6 @@
 import { Exception } from "types/exceptions"
-import offenceMatchingExceptions from "./offenceMatchingExceptions"
+import getOffenceMatchingExceptions from "./getOffenceMatchingExceptions"
 
-const filterOffenceMatchingException = (exceptions: Exception[]): Exception[] =>
-  exceptions.filter((exception) => offenceMatchingExceptions.offenceNotMatched.includes(exception.code))
+const hasOffenceMatchingExceptions = (exceptions: Exception[]) => getOffenceMatchingExceptions(exceptions).length > 0
 
-const hasOffenceMatchingExceptions = (exceptions: Exception[]) => filterOffenceMatchingException(exceptions).length > 0
-
-export { filterOffenceMatchingException }
 export default hasOffenceMatchingExceptions