MAN-355 fix activity log filter caching issue

ministryofjustice · Jan 30, 2025 · 825ec64 · 825ec64
1 parent 1478c21
commit 825ec64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/server/@types/ActivityLog.type.ts b/server/@types/ActivityLog.type.ts
@@ -33,6 +33,7 @@ export interface ActivityLogFiltersResponse extends ActivityLogFilters {
 }
 
 export interface ActivityLogCache extends ActivityLogFilters {
+  crn: string
   personActivity: PersonActivity
   tierCalculation: TierCalculation
 }
diff --git a/server/middleware/getPersonActivity.ts b/server/middleware/getPersonActivity.ts
@@ -25,6 +25,7 @@ export const getPersonActivity = async (
   if (req?.session?.cache?.activityLog) {
     const cache: ActivityLogCache | undefined = req.session.cache.activityLog.find(
       cacheItem =>
+        crn === cacheItem.crn &&
         keywords === cacheItem.keywords &&
         dateFrom === cacheItem.dateFrom &&
         dateTo === cacheItem.dateTo &&
@@ -51,6 +52,7 @@ export const getPersonActivity = async (
     const newCache: ActivityLogCache[] = [
       ...(req?.session?.cache?.activityLog || []),
       {
+        crn,
         keywords,
         dateFrom,
         dateTo,