Merge branch 'main' of github.com:island-is/island.is into j-s/review…

…-status-fix

apps/judicial-system/backend/src/app/formatters/confirmedIndictmentPdf.ts

@@ -4,14 +4,14 @@ import { formatDate, lowercase } from '@island.is/judicial-system/formatters'
 
 import {
   calculatePt,
+  Confirmation,
   drawTextWithEllipsisPDFKit,
-  IndictmentConfirmation,
   smallFontSize,
 } from './pdfHelpers'
 import { PDFKitCoatOfArms } from './PDFKitCoatOfArms'
 
 export const createConfirmedIndictment = async (
-  confirmation: IndictmentConfirmation,
+  confirmation: Confirmation,
   indictmentPDF: Buffer,
 ): Promise<Buffer> => {
   const pdfDoc = await PDFDocument.load(indictmentPDF)

apps/judicial-system/backend/src/app/formatters/index.ts

@@ -29,7 +29,7 @@ export {
   formatPostponedCourtDateEmailNotification,
   stripHtmlTags,
 } from './formatters'
-export { IndictmentConfirmation } from './pdfHelpers'
+export { Confirmation } from './pdfHelpers'
 export { getRequestPdfAsBuffer, getRequestPdfAsString } from './requestPdf'
 export { getRulingPdfAsBuffer, getRulingPdfAsString } from './rulingPdf'
 export { createCaseFilesRecord } from './caseFilesRecordPdf'

apps/judicial-system/backend/src/app/formatters/indictmentPdf.ts

@@ -16,7 +16,7 @@ import {
   addNormalPlusJustifiedText,
   addNormalPlusText,
   addNormalText,
-  IndictmentConfirmation,
+  Confirmation,
   setTitle,
 } from './pdfHelpers'
 
@@ -52,7 +52,7 @@ const roman = (num: number) => {
 export const createIndictment = async (
   theCase: Case,
   formatMessage: FormatMessage,
-  confirmation?: IndictmentConfirmation,
+  confirmation?: Confirmation,
 ): Promise<Buffer> => {
   const doc = new PDFDocument({
     size: 'A4',

apps/judicial-system/backend/src/app/formatters/pdfHelpers.ts

@@ -5,7 +5,7 @@ import { formatDate, lowercase } from '@island.is/judicial-system/formatters'
 import { coatOfArms } from './coatOfArms'
 import { policeStar } from './policeStar'
 
-export interface IndictmentConfirmation {
+export interface Confirmation {
   actor: string
   title?: string
   institution: string
@@ -22,6 +22,10 @@ export const largeFontSize = 18
 export const hugeFontSize = 26
 export const giganticFontSize = 33
 
+const lightGray = '#FAFAFA'
+const darkGray = '#CBCBCB'
+const gold = '#ADA373'
+
 const setFont = (doc: PDFKit.PDFDocument, font?: string) => {
   if (font) {
     doc.font(font)
@@ -106,13 +110,105 @@ export const addPoliceStar = (doc: PDFKit.PDFDocument) => {
   doc.scale(25).translate(-270, -70)
 }
 
+export const addConfirmation = (
+  doc: PDFKit.PDFDocument,
+  confirmation: Confirmation,
+) => {
+  const pageMargin = calculatePt(18)
+  const shaddowHeight = calculatePt(70)
+  const coatOfArmsWidth = calculatePt(105)
+  const coatOfArmsX = pageMargin + calculatePt(8)
+  const titleHeight = calculatePt(24)
+  const titleX = coatOfArmsX + coatOfArmsWidth + calculatePt(8)
+  const institutionWidth = calculatePt(160)
+  const confirmedByWidth = institutionWidth + calculatePt(48)
+  const shaddowWidth = institutionWidth + confirmedByWidth + coatOfArmsWidth
+  const titleWidth = institutionWidth + confirmedByWidth
+
+  // Draw the shadow
+  doc
+    .rect(pageMargin, pageMargin + calculatePt(8), shaddowWidth, shaddowHeight)
+    .fill(lightGray)
+    .stroke()
+
+  // Draw the coat of arms
+  doc
+    .rect(coatOfArmsX, pageMargin, coatOfArmsWidth, shaddowHeight)
+    .fillAndStroke('white', darkGray)
+
+  addCoatOfArms(doc, calculatePt(49), calculatePt(24))
+
+  // Draw the title
+  doc
+    .rect(coatOfArmsX + coatOfArmsWidth, pageMargin, titleWidth, titleHeight)
+    .fillAndStroke(lightGray, darkGray)
+  doc.fill('black')
+  doc.font('Times-Bold')
+  doc
+    .fontSize(calculatePt(smallFontSize))
+    .text('Réttarvörslugátt', titleX, pageMargin + calculatePt(9))
+  doc.font('Times-Roman')
+  // The X value here is approx. 8px after the title
+  doc.text('Rafræn staðfesting', calculatePt(210), pageMargin + calculatePt(9))
+  doc.text(
+    formatDate(confirmation.date) || '',
+    shaddowWidth - calculatePt(24),
+    pageMargin + calculatePt(9),
+  )
+
+  // Draw the institution
+  doc
+    .rect(
+      coatOfArmsX + coatOfArmsWidth,
+      pageMargin + titleHeight,
+      institutionWidth,
+      shaddowHeight - titleHeight,
+    )
+    .fillAndStroke('white', darkGray)
+  doc.fill('black')
+  doc.font('Times-Bold')
+  doc.text('Dómstóll', titleX, pageMargin + titleHeight + calculatePt(10))
+  doc.font('Times-Roman')
+  drawTextWithEllipsis(
+    doc,
+    confirmation.institution,
+    titleX,
+    pageMargin + titleHeight + calculatePt(22),
+    institutionWidth - calculatePt(16),
+  )
+
+  // Draw the actor
+  doc
+    .rect(
+      coatOfArmsX + coatOfArmsWidth + institutionWidth,
+      pageMargin + titleHeight,
+      confirmedByWidth,
+      shaddowHeight - titleHeight,
+    )
+    .fillAndStroke('white', darkGray)
+  doc.fill('black')
+  doc.font('Times-Bold')
+  doc.text(
+    'Samþykktaraðili',
+    titleX + institutionWidth,
+    pageMargin + titleHeight + calculatePt(10),
+  )
+  doc.font('Times-Roman')
+  doc.text(
+    `${confirmation.actor}${
+      confirmation.title ? `, ${lowercase(confirmation.title)}` : ''
+    }`,
+    titleX + institutionWidth,
+    pageMargin + titleHeight + calculatePt(22),
+  )
+
+  doc.fillColor('black')
+}
+
 export const addIndictmentConfirmation = (
   doc: PDFKit.PDFDocument,
-  confirmation: IndictmentConfirmation,
+  confirmation: Confirmation,
 ) => {
-  const lightGray = '#FAFAFA'
-  const darkGray = '#CBCBCB'
-  const gold = '#ADA373'
   const pageMargin = calculatePt(18)
   const shaddowHeight = calculatePt(90)
   const coatOfArmsWidth = calculatePt(105)

apps/judicial-system/backend/src/app/formatters/subpoenaPdf.ts

@@ -13,6 +13,7 @@ import { subpoena as strings } from '../messages'
 import { Case } from '../modules/case'
 import { Defendant } from '../modules/defendant'
 import {
+  addConfirmation,
   addEmptyLines,
   addFooter,
   addHugeHeading,
@@ -49,6 +50,11 @@ export const createSubpoena = (
   doc.on('data', (chunk) => sinc.push(chunk))
 
   setTitle(doc, formatMessage(strings.title))
+
+  if (dateLog) {
+    addEmptyLines(doc, 5)
+  }
+
   addNormalText(doc, `${theCase.court?.name}`, 'Times-Bold', true)
 
   addNormalRightAlignedText(
@@ -148,6 +154,15 @@ export const createSubpoena = (
 
   addFooter(doc)
 
+  if (dateLog) {
+    addConfirmation(doc, {
+      actor: theCase.judge?.name || '',
+      title: theCase.judge?.title,
+      institution: theCase.judge?.institution?.name || '',
+      date: dateLog.created,
+    })
+  }
+
   doc.end()
 
   return new Promise<Buffer>((resolve) =>

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

@@ -68,7 +68,7 @@ import {
   prosecutorRule,
   publicProsecutorStaffRule,
 } from '../../guards'
-import { CaseEvent, EventService } from '../event'
+import { EventService } from '../event'
 import { UserService } from '../user'
 import { CreateCaseDto } from './dto/createCase.dto'
 import { TransitionCaseDto } from './dto/transitionCase.dto'
@@ -99,8 +99,8 @@ import {
   prosecutorUpdateRule,
   publicProsecutorStaffUpdateRule,
 } from './guards/rolesRules'
-import { CaseInterceptor } from './interceptors/case.interceptor'
 import { CaseListInterceptor } from './interceptors/caseList.interceptor'
+import { CompletedAppealAccessedInterceptor } from './interceptors/completedAppealAccessed.interceptor'
 import { Case } from './models/case.model'
 import { SignatureConfirmationResponse } from './models/signatureConfirmation.response'
 import { transitionCase } from './state/case.state'
@@ -465,7 +465,7 @@ export class CaseController {
   )
   @Get('case/:caseId')
   @ApiOkResponse({ type: Case, description: 'Gets an existing case' })
-  @UseInterceptors(CaseInterceptor)
+  @UseInterceptors(CompletedAppealAccessedInterceptor)
   getById(@Param('caseId') caseId: string, @CurrentCase() theCase: Case): Case {
     this.logger.debug(`Getting case ${caseId} by id`)
 
@@ -545,6 +545,7 @@ export class CaseController {
   @RolesRules(
     prosecutorRule,
     prosecutorRepresentativeRule,
+    publicProsecutorStaffRule,
     districtCourtJudgeRule,
     districtCourtRegistrarRule,
     districtCourtAssistantRule,
@@ -700,6 +701,7 @@ export class CaseController {
   @RolesRules(
     prosecutorRule,
     prosecutorRepresentativeRule,
+    publicProsecutorStaffRule,
     districtCourtJudgeRule,
     districtCourtRegistrarRule,
     districtCourtAssistantRule,

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

@@ -56,7 +56,7 @@ import {
 import { AwsS3Service } from '../aws-s3'
 import { CourtService } from '../court'
 import { Defendant, DefendantService } from '../defendant'
-import { CaseEvent, EventService } from '../event'
+import { EventService } from '../event'
 import { EventLog, EventLogService } from '../event-log'
 import { CaseFile, FileService } from '../file'
 import { IndictmentCount } from '../indictment-count'

apps/judicial-system/backend/src/app/modules/case/guards/limitedAccessCaseExists.guard.ts

@@ -14,7 +14,7 @@ export class LimitedAccessCaseExistsGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest()
 
-    const caseId = request.params.caseId
+    const caseId: string = request.params.caseId
 
     if (!caseId) {
       throw new BadRequestException('Missing case id')

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

@@ -0,0 +1,53 @@
+import { Observable } from 'rxjs'
+import { map } from 'rxjs/operators'
+
+import {
+  CallHandler,
+  ExecutionContext,
+  Injectable,
+  NestInterceptor,
+} from '@nestjs/common'
+
+import {
+  CaseAppealState,
+  CaseFileCategory,
+  isDefenceUser,
+  isPrisonStaffUser,
+  isPrisonSystemUser,
+  User,
+} from '@island.is/judicial-system/types'
+
+import { Case } from '../models/case.model'
+
+@Injectable()
+export class CaseFileInterceptor implements NestInterceptor {
+  intercept(context: ExecutionContext, next: CallHandler): Observable<Case> {
+    const request = context.switchToHttp().getRequest()
+    const user: User = request.user
+
+    return next.handle().pipe(
+      map((data: Case) => {
+        if (isDefenceUser(user)) {
+          return data
+        }
+
+        if (
+          isPrisonStaffUser(user) ||
+          data.appealState !== CaseAppealState.COMPLETED
+        ) {
+          data.caseFiles?.splice(0, data.caseFiles.length)
+        } else if (isPrisonSystemUser(user)) {
+          data.caseFiles?.splice(
+            0,
+            data.caseFiles.length,
+            ...data.caseFiles.filter(
+              (cf) => cf.category === CaseFileCategory.APPEAL_RULING,
+            ),
+          )
+        }
+
+        return data
+      }),
+    )
+  }
+}

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

@@ -20,7 +20,7 @@ import { EventLogService } from '../../event-log'
 import { Case } from '../models/case.model'
 
 @Injectable()
-export class CaseInterceptor implements NestInterceptor {
+export class CompletedAppealAccessedInterceptor implements NestInterceptor {
   constructor(private readonly eventLogService: EventLogService) {}
 
   intercept(context: ExecutionContext, next: CallHandler): Observable<Case> {

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

@@ -23,7 +23,7 @@ import {
   restrictionCases,
 } from '@island.is/judicial-system/types'
 
-import { CaseEvent, EventService } from '../event'
+import { EventService } from '../event'
 import { DeliverDto } from './dto/deliver.dto'
 import { DeliverCancellationNoticeDto } from './dto/deliverCancellationNotice.dto'
 import { InternalCasesDto } from './dto/internalCases.dto'

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

@@ -53,7 +53,7 @@ import { AwsS3Service } from '../aws-s3'
 import { CourtDocumentFolder, CourtService } from '../court'
 import { courtSubtypes } from '../court/court.service'
 import { Defendant, DefendantService } from '../defendant'
-import { CaseEvent, EventService } from '../event'
+import { EventService } from '../event'
 import { CaseFile, FileService } from '../file'
 import { IndictmentCount, IndictmentCountService } from '../indictment-count'
 import { Institution } from '../institution'

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

@@ -40,7 +40,7 @@ import {
 
 import { nowFactory } from '../../factories'
 import { defenderRule, prisonSystemStaffRule } from '../../guards'
-import { CaseEvent, EventService } from '../event'
+import { EventService } from '../event'
 import { User } from '../user'
 import { TransitionCaseDto } from './dto/transitionCase.dto'
 import { UpdateCaseDto } from './dto/updateCase.dto'
@@ -53,7 +53,8 @@ import { CaseWriteGuard } from './guards/caseWrite.guard'
 import { LimitedAccessCaseExistsGuard } from './guards/limitedAccessCaseExists.guard'
 import { RequestSharedWithDefenderGuard } from './guards/requestSharedWithDefender.guard'
 import { defenderTransitionRule, defenderUpdateRule } from './guards/rolesRules'
-import { CaseInterceptor } from './interceptors/case.interceptor'
+import { CaseFileInterceptor } from './interceptors/caseFile.interceptor'
+import { CompletedAppealAccessedInterceptor } from './interceptors/completedAppealAccessed.interceptor'
 import { Case } from './models/case.model'
 import { transitionCase } from './state/case.state'
 import {
@@ -85,7 +86,7 @@ export class LimitedAccessCaseController {
     type: Case,
     description: 'Gets a limited set of properties of an existing case',
   })
-  @UseInterceptors(CaseInterceptor)
+  @UseInterceptors(CompletedAppealAccessedInterceptor, CaseFileInterceptor)
   async getById(
     @Param('caseId') caseId: string,
     @CurrentCase() theCase: Case,