feat(j-s): Allow district court assistant to act as registrar in R cases

apps/judicial-system/backend/src/app/modules/case/case.controller.ts

@@ -200,7 +200,7 @@ export class CaseController {
     if (update.registrarId) {
       await this.validateAssignedUser(
         update.registrarId,
-        [UserRole.DISTRICT_COURT_REGISTRAR],
+        [UserRole.DISTRICT_COURT_REGISTRAR, UserRole.DISTRICT_COURT_ASSISTANT],
         theCase.courtId,
       )
     }

apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts

@@ -112,18 +112,6 @@ const canPublicProsecutionUserAccessCase = (theCase: Case): boolean => {
 }
 
 const canDistrictCourtUserAccessCase = (theCase: Case, user: User): boolean => {
-  // Check case type access
-  if (
-    ![
-      UserRole.DISTRICT_COURT_JUDGE,
-      UserRole.DISTRICT_COURT_REGISTRAR,
-    ].includes(user.role)
-  ) {
-    if (!isIndictmentCase(theCase.type)) {
-      return false
-    }
-  }
-
   // Check case state access
   if (isRequestCase(theCase.type)) {
     if (

apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts

@@ -108,52 +108,38 @@ const getDistrictCourtUserCasesQueryFilter = (user: User): WhereOptions => {
     },
   ]
 
-  if (user.role === UserRole.DISTRICT_COURT_ASSISTANT) {
-    options.push(
-      { type: indictmentCases },
+  options.push({
+    [Op.or]: [
       {
-        state: [
-          CaseState.SUBMITTED,
-          CaseState.WAITING_FOR_CANCELLATION,
-          CaseState.RECEIVED,
-          CaseState.COMPLETED,
+        [Op.and]: [
+          { type: [...restrictionCases, ...investigationCases] },
+          {
+            state: [
+              CaseState.DRAFT,
+              CaseState.SUBMITTED,
+              CaseState.RECEIVED,
+              CaseState.ACCEPTED,
+              CaseState.REJECTED,
+              CaseState.DISMISSED,
+            ],
+          },
         ],
       },
-    )
-  } else {
-    options.push({
-      [Op.or]: [
-        {
-          [Op.and]: [
-            { type: [...restrictionCases, ...investigationCases] },
-            {
-              state: [
-                CaseState.DRAFT,
-                CaseState.SUBMITTED,
-                CaseState.RECEIVED,
-                CaseState.ACCEPTED,
-                CaseState.REJECTED,
-                CaseState.DISMISSED,
-              ],
-            },
-          ],
-        },
-        {
-          [Op.and]: [
-            { type: indictmentCases },
-            {
-              state: [
-                CaseState.SUBMITTED,
-                CaseState.WAITING_FOR_CANCELLATION,
-                CaseState.RECEIVED,
-                CaseState.COMPLETED,
-              ],
-            },
-          ],
-        },
-      ],
-    })
-  }
+      {
+        [Op.and]: [
+          { type: indictmentCases },
+          {
+            state: [
+              CaseState.SUBMITTED,
+              CaseState.WAITING_FOR_CANCELLATION,
+              CaseState.RECEIVED,
+              CaseState.COMPLETED,
+            ],
+          },
+        ],
+      },
+    ],
+  })
 
   return {
     [Op.and]: options,

apps/judicial-system/backend/src/app/modules/case/filters/test/districtCourtUserFilter.spec.ts

@@ -62,10 +62,7 @@ const continueFromIndictmentType = (user: User, type: string) => {
   })
 }
 
-describe.each([
-  UserRole.DISTRICT_COURT_JUDGE,
-  UserRole.DISTRICT_COURT_REGISTRAR,
-])('district court user %s', (role) => {
+describe.each(districtCourtRoles)('district court user %s', (role) => {
   const user = {
     role,
     institution: { id: uuid(), type: InstitutionType.DISTRICT_COURT },
@@ -109,31 +106,3 @@ describe.each([
     continueFromIndictmentType(user, type)
   })
 })
-
-describe.each(
-  districtCourtRoles.filter(
-    (role) =>
-      role !== UserRole.DISTRICT_COURT_JUDGE &&
-      role !== UserRole.DISTRICT_COURT_REGISTRAR,
-  ),
-)('district court user %s', (role) => {
-  const user = {
-    role,
-    institution: { id: uuid(), type: InstitutionType.DISTRICT_COURT },
-  } as User
-
-  describe.each([...restrictionCases, ...investigationCases])(
-    'inaccessible case type %s',
-    (type) => {
-      const theCase = {
-        type,
-      } as Case
-
-      verifyNoAccess(theCase, user)
-    },
-  )
-
-  describe.each(indictmentCases)('accessible case type %s', (type) => {
-    continueFromIndictmentType(user, type)
-  })
-})

apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/SelectCourtOfficials/SelectCourtOfficials.tsx

@@ -2,6 +2,7 @@ import { useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Select, Tooltip } from '@island.is/island-ui/core'
+import { isRequestCase } from '@island.is/judicial-system/types'
 import {
   BlueBox,
   FormContext,
@@ -73,7 +74,9 @@ const SelectCourtOfficials = () => {
   const registrars = (usersData?.users ?? [])
     .filter(
       (user: User) =>
-        user.role === UserRole.DISTRICT_COURT_REGISTRAR &&
+        (user.role === UserRole.DISTRICT_COURT_REGISTRAR ||
+          (isRequestCase(workingCase.type) &&
+            user.role === UserRole.DISTRICT_COURT_ASSISTANT)) &&
         user.institution?.id === workingCase.court?.id,
     )
     .map((registrar: User) => {

apps/judicial-system/web/src/routes/Shared/Cases/useFilter.tsx

@@ -79,10 +79,7 @@ export const filterOptionsForUser = (
   user?: User | undefined,
 ) => {
   return options.filter((option) => {
-    if (
-      user?.role === UserRole.PROSECUTOR_REPRESENTATIVE ||
-      user?.role === UserRole.DISTRICT_COURT_ASSISTANT
-    ) {
+    if (user?.role === UserRole.PROSECUTOR_REPRESENTATIVE) {
       return option.value !== 'INVESTIGATION' && option.value !== 'INDICTMENT'
     }