fix filter

island-is · May 10, 2024 · 13600f5 · 13600f5
1 parent 812d7c5
commit 13600f5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 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
@@ -44,10 +44,12 @@ const getProsecutionUserCasesQueryFilter = (user: User): WhereOptions => {
       [Op.or]: [
         { prosecutors_office_id: user.institution?.id },
         { shared_with_prosecutors_office_id: user.institution?.id },
-        [
-          { indictment_reviewer_id: user.id },
-          { indictment_review_decision: null },
-        ],
+        {
+          [Op.and]: [
+            { indictment_reviewer_id: user.id },
+            { indictment_review_decision: null },
+          ],
+        },
       ],
     },
     {

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,10 +60,12 @@ describe('getCasesQueryFilter', () => {
           [Op.or]: [
             { prosecutors_office_id: 'Prosecutors Office Id' },
             { shared_with_prosecutors_office_id: 'Prosecutors Office Id' },
-            [
-              { indictment_reviewer_id: 'Prosecutor Id' },
-              { indictment_review_decision: null },
-            ],
+            {
+              [Op.and]: [
+                { indictment_reviewer_id: 'Prosecutor Id' },
+                { indictment_review_decision: null },
+              ],
+            },
           ],
         },
         {
@@ -121,10 +123,12 @@ describe('getCasesQueryFilter', () => {
           [Op.or]: [
             { prosecutors_office_id: 'Prosecutors Office Id' },
             { shared_with_prosecutors_office_id: 'Prosecutors Office Id' },
-            [
-              { indictment_reviewer_id: 'Prosecutor Id' },
-              { indictment_review_decision: null },
-            ],
+            {
+              [Op.and]: [
+                { indictment_reviewer_id: 'Prosecutor Id' },
+                { indictment_review_decision: null },
+              ],
+            },
           ],
         },
         {