MAN-226 rename request body property from 'compliance' to 'filters'

ministryofjustice · Jan 23, 2025 · 297b37b · 297b37b
1 parent 28df42b
commit 297b37b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/server/@types/ActivityLog.type.ts b/server/@types/ActivityLog.type.ts
@@ -8,6 +8,13 @@ export interface ActivityLogFilters {
   compliance: string[]
 }
 
+export interface ActivityLogRequestBody {
+  keywords: string
+  dateFrom: string
+  dateTo: string
+  filters: string[]
+}
+
 export interface SelectedFilterItem {
   text: string
   href: string

diff --git a/server/data/masApiClient.ts b/server/data/masApiClient.ts
@@ -20,7 +20,7 @@ import { TeamCaseload, UserCaseload, UserTeam, UserLocations } from './model/cas
 import { ProfessionalContact } from './model/professionalContact'
 import { CaseAccess, UserAccess } from './model/caseAccess'
 import { LicenceConditionNoteDetails } from './model/licenceConditionNoteDetails'
-import { AppointmentRequestBody, ActivityLogFilters } from '../@types'
+import { AppointmentRequestBody, ActivityLogFilters, ActivityLogRequestBody } from '../@types'
 import { RequirementNoteDetails } from './model/requirementNoteDetails'
 
 export default class MasApiClient extends RestClient {
@@ -126,7 +126,7 @@ export default class MasApiClient extends RestClient {
 
   postPersonActivityLog = async (
     crn: string,
-    body: ActivityLogFilters,
+    body: ActivityLogRequestBody,
     page: string,
   ): Promise<PersonActivity | null> => {
     const pageQuery = `?${new URLSearchParams({ size: '10', page }).toString()}`

diff --git a/server/middleware/filterActivityLog.ts b/server/middleware/filterActivityLog.ts
@@ -11,7 +11,7 @@ export const filterActivityLog: Route<void> = (req, res, next) => {
     return res.redirect(url)
   }
   const { crn } = req.params
-  const { keywords = '', dateFrom = '', dateTo = '', clearFilterKey, clearFilterValue, page = '1' } = req.query
+  const { keywords = '', dateFrom = '', dateTo = '', clearFilterKey, clearFilterValue } = req.query
   const errors = req?.session?.errors
   let { compliance } = req.query
   const baseUrl = `/case/${crn}/activity-log`

diff --git a/server/routes/activityLog.ts b/server/routes/activityLog.ts
@@ -12,7 +12,7 @@ import TierApiClient from '../data/tierApiClient'
 import validate from '../middleware/validation/index'
 import { toCamelCase, toISODate } from '../utils/utils'
 import { filterActivityLog } from '../middleware'
-import type { ActivityLogCache, ActivityLogFilters, AppResponse, Route } from '../@types'
+import type { ActivityLogCache, ActivityLogRequestBody, AppResponse, Route } from '../@types'
 import { PersonActivity } from '../data/model/activityLog'
 
 export default function activityLogRoutes(router: Router, { hmppsAuthClient }: Services) {
@@ -57,11 +57,11 @@ export default function activityLogRoutes(router: Router, { hmppsAuthClient }: S
         }
       }
       if (!personActivity) {
-        const body: ActivityLogFilters = {
+        const body: ActivityLogRequestBody = {
           keywords,
           dateFrom: dateFrom ? toISODate(dateFrom) : '',
           dateTo: dateTo ? toISODate(dateTo) : '',
-          compliance: compliance ? compliance.map(option => toCamelCase(option as string)) : [],
+          filters: compliance ? compliance.map(option => toCamelCase(option as string)) : [],
         }
         ;[personActivity, tierCalculation] = await Promise.all([
           masClient.postPersonActivityLog(crn, body, page as string),