From c306f1a6c2e92e8b8fdaa82ec5d9276154596289 Mon Sep 17 00:00:00 2001
From: unakb <una@kolibri.is>
Date: Wed, 15 May 2024 10:05:43 +0000
Subject: [PATCH] fix(j-s): Filtering of public prosecutor cases

---
 .../src/app/modules/case/filters/cases.filter.ts   |  5 +----
 .../modules/case/filters/test/cases.filter.spec.ts | 14 ++------------
 .../web/src/routes/Shared/Cases/Cases.tsx          |  4 +---
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts b/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts
index cb69ea32ded6..ad445195671e 100644
--- a/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts
@@ -45,10 +45,7 @@ const getProsecutionUserCasesQueryFilter = (user: User): WhereOptions => {
         { prosecutors_office_id: user.institution?.id },
         { shared_with_prosecutors_office_id: user.institution?.id },
         {
-          [Op.and]: [
-            { indictment_reviewer_id: user.id },
-            { indictment_review_decision: null },
-          ],
+          [Op.and]: [{ indictment_reviewer_id: user.id }],
         },
       ],
     },
diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts b/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts
index 1d300326d654..ae76694aef42 100644
--- a/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts
@@ -60,12 +60,7 @@ describe('getCasesQueryFilter', () => {
           [Op.or]: [
             { prosecutors_office_id: 'Prosecutors Office Id' },
             { shared_with_prosecutors_office_id: 'Prosecutors Office Id' },
-            {
-              [Op.and]: [
-                { indictment_reviewer_id: 'Prosecutor Id' },
-                { indictment_review_decision: null },
-              ],
-            },
+            { indictment_reviewer_id: 'Prosecutor Id' },
           ],
         },
         {
@@ -123,12 +118,7 @@ describe('getCasesQueryFilter', () => {
           [Op.or]: [
             { prosecutors_office_id: 'Prosecutors Office Id' },
             { shared_with_prosecutors_office_id: 'Prosecutors Office Id' },
-            {
-              [Op.and]: [
-                { indictment_reviewer_id: 'Prosecutor Id' },
-                { indictment_review_decision: null },
-              ],
-            },
+            { indictment_reviewer_id: 'Prosecutor Id' },
           ],
         },
         {
diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx
index a37db9b1cfbe..370da48a6d1a 100644
--- a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx
@@ -151,9 +151,7 @@ export const Cases: React.FC = () => {
 
     const casesAwaitingReview = filterCases(
       (c) =>
-        isIndictmentCase(c.type) &&
-        c.indictmentReviewer !== null &&
-        c.indictmentReviewer?.id === user?.id,
+        c.indictmentReviewer?.id === user?.id && !c.indictmentReviewDecision,
     )
 
     const activeCases = filterCases((c) => {