fix(j-s): Filtering of public prosecutor cases

island-is · May 15, 2024 · c306f1a · c306f1a
1 parent b3b8102
commit c306f1a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -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
@@ -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
@@ -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) => {