Merge branch 'main' into fix/web-rss-event-feed-single-digit-dates

apps/judicial-system/api/src/app/modules/defendant/models/defendant.model.ts

@@ -110,6 +110,9 @@ export class Defendant {
   @Field(() => String, { nullable: true })
   readonly sentToPrisonAdminDate?: string
 
+  @Field(() => String, { nullable: true })
+  readonly openedByPrisonAdminDate?: string
+
   @Field(() => PunishmentType, { nullable: true })
   readonly punishmentType?: PunishmentType
 }

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

@@ -417,6 +417,16 @@ export const caseListInclude: Includeable[] = [
     as: 'defendants',
     required: false,
     order: [['created', 'ASC']],
+    include: [
+      {
+        model: DefendantEventLog,
+        as: 'eventLogs',
+        required: false,
+        where: { eventType: defendantEventTypes },
+        order: [['created', 'DESC']],
+        separate: true,
+      },
+    ],
     separate: true,
   },
   {

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

@@ -7,6 +7,8 @@ import {
   NestInterceptor,
 } from '@nestjs/common'
 
+import { DefendantEventType } from '@island.is/judicial-system/types'
+
 import { Defendant, DefendantEventLog } from '../../defendant'
 import { Case } from '../models/case.model'
 import { CaseString } from '../models/caseString.model'
@@ -15,8 +17,15 @@ export const transformDefendants = (defendants?: Defendant[]) => {
   return defendants?.map((defendant) => ({
     ...defendant.toJSON(),
     sentToPrisonAdminDate: defendant.isSentToPrisonAdmin
-      ? DefendantEventLog.sentToPrisonAdminDate(defendant.eventLogs)?.created
+      ? DefendantEventLog.getDefendantEventLogTypeDate({
+          defendantEventLogs: defendant.eventLogs,
+          eventType: DefendantEventType.SENT_TO_PRISON_ADMIN,
+        })
       : undefined,
+    openedByPrisonAdminDate: DefendantEventLog.getDefendantEventLogTypeDate({
+      defendantEventLogs: defendant.eventLogs,
+      eventType: DefendantEventType.OPENED_BY_PRISON_ADMIN,
+    }),
   }))
 }
 

apps/judicial-system/backend/src/app/modules/case/interceptors/defendantIndictmentAccessed.interceptor.ts

@@ -0,0 +1,63 @@
+import {
+  CallHandler,
+  ExecutionContext,
+  Injectable,
+  NestInterceptor,
+} from '@nestjs/common'
+
+import {
+  DefendantEventType,
+  isIndictmentCase,
+  isPrisonAdminUser,
+  User,
+} from '@island.is/judicial-system/types'
+
+import { DefendantEventLog, DefendantService } from '../../defendant'
+import { Case } from '../models/case.model'
+
+const hasValidOpenByPrisonAdminEvent = (
+  defendantEventLogs: DefendantEventLog[],
+) => {
+  const sentToPrisonAdminDate = DefendantEventLog.getDefendantEventLogTypeDate({
+    defendantEventLogs,
+    eventType: DefendantEventType.SENT_TO_PRISON_ADMIN,
+  })
+  const openedByPrisonAdminDate =
+    DefendantEventLog.getDefendantEventLogTypeDate({
+      defendantEventLogs,
+      eventType: DefendantEventType.OPENED_BY_PRISON_ADMIN,
+    })
+  return (
+    sentToPrisonAdminDate &&
+    openedByPrisonAdminDate &&
+    sentToPrisonAdminDate <= openedByPrisonAdminDate
+  )
+}
+
+@Injectable()
+export class DefendantIndictmentAccessedInterceptor implements NestInterceptor {
+  constructor(private readonly defendantService: DefendantService) {}
+
+  intercept(context: ExecutionContext, next: CallHandler) {
+    const request = context.switchToHttp().getRequest()
+    const user: User = request.user
+    const theCase: Case = request.case
+
+    if (isIndictmentCase(theCase.type) && isPrisonAdminUser(user)) {
+      const defendantsIndictmentNotOpened = theCase.defendants?.filter(
+        ({ isSentToPrisonAdmin, eventLogs = [] }) =>
+          isSentToPrisonAdmin && !hasValidOpenByPrisonAdminEvent(eventLogs),
+      )
+
+      // create new events for all defendants that prison admin has not accessed according to defendant event logs
+      defendantsIndictmentNotOpened?.forEach((defendant) =>
+        this.defendantService.createDefendantEvent({
+          caseId: theCase.id,
+          defendantId: defendant.id,
+          eventType: DefendantEventType.OPENED_BY_PRISON_ADMIN,
+        }),
+      )
+    }
+    return next.handle()
+  }
+}

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

@@ -30,13 +30,16 @@ import type { User as TUser } from '@island.is/judicial-system/types'
 import {
   CaseState,
   CaseType,
+  DefendantEventType,
   indictmentCases,
   investigationCases,
   restrictionCases,
+  UserRole,
 } from '@island.is/judicial-system/types'
 
 import { nowFactory } from '../../factories'
 import { defenderRule, prisonSystemStaffRule } from '../../guards'
+import { DefendantService } from '../defendant'
 import { EventService } from '../event'
 import { User } from '../user'
 import { TransitionCaseDto } from './dto/transitionCase.dto'
@@ -57,6 +60,7 @@ import {
 } from './guards/rolesRules'
 import { CaseInterceptor } from './interceptors/case.interceptor'
 import { CompletedAppealAccessedInterceptor } from './interceptors/completedAppealAccessed.interceptor'
+import { DefendantIndictmentAccessedInterceptor } from './interceptors/defendantIndictmentAccessed.interceptor'
 import { LimitedAccessCaseFileInterceptor } from './interceptors/limitedAccessCaseFile.interceptor'
 import { Case } from './models/case.model'
 import { transitionCase } from './state/case.state'
@@ -73,6 +77,7 @@ export class LimitedAccessCaseController {
     private readonly limitedAccessCaseService: LimitedAccessCaseService,
     private readonly eventService: EventService,
     private readonly pdfService: PdfService,
+    private readonly defendantService: DefendantService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
   ) {}
 
@@ -84,6 +89,7 @@ export class LimitedAccessCaseController {
   )
   @RolesRules(prisonSystemStaffRule, defenderRule)
   @UseInterceptors(
+    DefendantIndictmentAccessedInterceptor,
     CompletedAppealAccessedInterceptor,
     LimitedAccessCaseFileInterceptor,
     CaseInterceptor,
@@ -100,7 +106,7 @@ export class LimitedAccessCaseController {
   ): Promise<Case> {
     this.logger.debug(`Getting limitedAccess case ${caseId} by id`)
 
-    if (!theCase.openedByDefender) {
+    if (user.role === UserRole.DEFENDER && !theCase.openedByDefender) {
       const updated = await this.limitedAccessCaseService.update(
         theCase,
         { openedByDefender: nowFactory() },

apps/judicial-system/backend/src/app/modules/case/test/limitedAccessCaseController/getById.spec.ts

@@ -1,6 +1,6 @@
 import { uuid } from 'uuidv4'
 
-import type { User } from '@island.is/judicial-system/types'
+import { type User, UserRole } from '@island.is/judicial-system/types'
 
 import { createTestingCaseModule } from '../createTestingCaseModule'
 
@@ -14,14 +14,18 @@ interface Then {
   error: Error
 }
 
-type GivenWhenThen = (caseId: string, theCase: Case) => Promise<Then>
+type GivenWhenThen = (
+  caseId: string,
+  theCase: Case,
+  user?: User,
+) => Promise<Then>
 
 describe('LimitedAccessCaseController - Get by id', () => {
   let givenWhenThen: GivenWhenThen
   const openedBeforeDate = randomDate()
   const openedNowDate = randomDate()
   const caseId = uuid()
-  const user = { id: uuid() } as User
+  const defaultUser = { id: uuid() } as User
 
   let mockCaseModel: typeof Case
 
@@ -42,7 +46,11 @@ describe('LimitedAccessCaseController - Get by id', () => {
     const mockFindOne = mockCaseModel.findOne as jest.Mock
     mockFindOne.mockResolvedValue(updatedCase)
 
-    givenWhenThen = async (caseId: string, theCase: Case) => {
+    givenWhenThen = async (
+      caseId: string,
+      theCase: Case,
+      user = defaultUser,
+    ) => {
       const then = {} as Then
 
       try {
@@ -79,11 +87,11 @@ describe('LimitedAccessCaseController - Get by id', () => {
 
   describe('case exists and has not been opened by defender before', () => {
     const theCase = { id: caseId } as Case
-
+    const user = { ...defaultUser, role: UserRole.DEFENDER } as User
     let then: Then
 
     beforeEach(async () => {
-      then = await givenWhenThen(caseId, theCase)
+      then = await givenWhenThen(caseId, theCase, user)
     })
 
     it('should update openedByDefender and return case', () => {

apps/judicial-system/backend/src/app/modules/defendant/defendant.service.ts

@@ -271,6 +271,22 @@ export class DefendantService {
     return updatedDefendant
   }
 
+  async createDefendantEvent({
+    caseId,
+    defendantId,
+    eventType,
+  }: {
+    caseId: string
+    defendantId: string
+    eventType: DefendantEventType
+  }): Promise<void> {
+    await this.defendantEventLogModel.create({
+      caseId,
+      defendantId,
+      eventType,
+    })
+  }
+
   async updateIndictmentCaseDefendant(
     theCase: Case,
     defendant: Defendant,
@@ -284,7 +300,7 @@ export class DefendantService {
     )
 
     if (update.isSentToPrisonAdmin) {
-      this.defendantEventLogModel.create({
+      this.createDefendantEvent({
         caseId: theCase.id,
         defendantId: defendant.id,
         eventType: DefendantEventType.SENT_TO_PRISON_ADMIN,

apps/judicial-system/backend/src/app/modules/defendant/models/defendantEventLog.model.ts

@@ -20,11 +20,17 @@ import { Defendant } from './defendant.model'
   timestamps: true,
 })
 export class DefendantEventLog extends Model {
-  static sentToPrisonAdminDate(defendantEventLogs?: DefendantEventLog[]) {
+  // gets the latest log date of a given type, since the defendant event logs are sorted
+  static getDefendantEventLogTypeDate({
+    defendantEventLogs,
+    eventType,
+  }: {
+    defendantEventLogs?: DefendantEventLog[]
+    eventType: DefendantEventType
+  }) {
     return defendantEventLogs?.find(
-      (defendantEventLog) =>
-        defendantEventLog.eventType === DefendantEventType.SENT_TO_PRISON_ADMIN,
-    )
+      (defendantEventLog) => defendantEventLog.eventType === eventType,
+    )?.created
   }
 
   @Column({

apps/judicial-system/web/src/components/FormProvider/case.graphql

@@ -35,6 +35,7 @@ query Case($input: CaseQueryInput!) {
       subpoenaType
       isSentToPrisonAdmin
       sentToPrisonAdminDate
+      openedByPrisonAdminDate
       punishmentType
       subpoenas {
         id

apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql

@@ -47,6 +47,7 @@ query LimitedAccessCase($input: CaseQueryInput!) {
       subpoenaType
       isSentToPrisonAdmin
       sentToPrisonAdminDate
+      openedByPrisonAdminDate
       punishmentType
       subpoenas {
         id

apps/judicial-system/web/src/components/Tags/utils.ts

@@ -119,3 +119,19 @@ export const getIndictmentRulingDecisionTag = (
       return { color: 'darkerBlue', text: strings.complete }
   }
 }
+
+export const getPrisonCaseStateTag = (
+  prisonCaseState: CaseState,
+): {
+  color: TagVariant
+  text: { id: string; defaultMessage: string; description: string }
+} => {
+  switch (prisonCaseState) {
+    case CaseState.NEW:
+      return { color: 'purple', text: strings.new }
+    case CaseState.RECEIVED:
+      return { color: 'blue', text: strings.received }
+    default:
+      return { color: 'darkerBlue', text: strings.complete }
+  }
+}

apps/judicial-system/web/src/routes/Defender/Cases/components/DefenderCasesTable.tsx

@@ -57,6 +57,9 @@ export const DefenderCasesTable: FC<Props> = ({
     ) {
       return entry.defendants[0].name ?? ''
     }
+    if (column === 'courtDate') {
+      return entry.courtDate
+    }
     return entry.created
   }
   const { sortedData, requestSort, getClassNamesFor, isActiveColumn } = useSort(
@@ -129,9 +132,13 @@ export const DefenderCasesTable: FC<Props> = ({
                 </th>
               ) : (
                 <th>
-                  <Text fontWeight="regular">
-                    {formatMessage(tables.hearingArrangementDate)}
-                  </Text>
+                  <SortButton
+                    title={formatMessage(tables.hearingArrangementDate)}
+                    onClick={() => requestSort('courtDate')}
+                    sortAsc={getClassNamesFor('courtDate') === 'ascending'}
+                    sortDes={getClassNamesFor('courtDate') === 'descending'}
+                    isActive={isActiveColumn('courtDate')}
+                  />
                 </th>
               )}
               <th></th>

apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.strings.ts

@@ -14,7 +14,12 @@ export const strings = defineMessages({
   indictmentCompletedTitle: {
     id: 'judicial.system.core:indictment_overview.indictment_completed_title',
     defaultMessage: 'Dómsuppkvaðning {date}',
-    description: 'Titill á yfirliti ákæru fyrir fangelsi',
+    description: 'Undirtitill á yfirliti ákæru fyrir fangelsi',
+  },
+  indictmentReceivedTitle: {
+    id: 'judicial.system.core:indictment_overview.indictment_received_title',
+    defaultMessage: 'Móttekið {date}',
+    description: 'Undirtitill á yfirliti ákæru fyrir fangelsi',
   },
   infoCardDefendantsTitle: {
     id: 'judicial.system.core:indictment_overview.info_card_defendants_title',

apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx

@@ -81,6 +81,13 @@ const IndictmentOverview = () => {
               })}
             </Text>
           )}
+          {defendant?.openedByPrisonAdminDate && (
+            <Text variant="h4" as="h3">
+              {formatMessage(strings.indictmentReceivedTitle, {
+                date: formatDate(defendant.openedByPrisonAdminDate, 'PPP'),
+              })}
+            </Text>
+          )}
         </Box>
         <Box marginBottom={5}>
           <InfoCardClosedIndictment displayVerdictViewDate />