Merge branch 'main' into feat/native-app-add-optional-scopes

apps/financial-aid/api/src/app/modules/municipality/dto/updateMunicipality.input.ts

@@ -1,7 +1,7 @@
 import { Allow } from 'class-validator'
 
 import { Field, InputType } from '@nestjs/graphql'
-import type { Aid } from '@island.is/financial-aid/shared/lib'
+import type { Aid, ChildrenAid } from '@island.is/financial-aid/shared/lib'
 import { AidInput } from '../../aid'
 
 @InputType()
@@ -42,6 +42,10 @@ export class UpdateMunicipalityInput {
   @Field({ nullable: true })
   readonly navPassword?: string
 
+  @Allow()
+  @Field(() => String, { nullable: true })
+  readonly childrenAid?: ChildrenAid
+
   @Allow()
   @Field()
   readonly municipalityId!: string

apps/financial-aid/api/src/app/modules/municipality/models/municipality.model.ts

@@ -1,6 +1,6 @@
 import { Field, ObjectType, ID } from '@nestjs/graphql'
 
-import { Municipality } from '@island.is/financial-aid/shared/lib'
+import { ChildrenAid, Municipality } from '@island.is/financial-aid/shared/lib'
 
 import { AidModel } from '../../aid'
 import { StaffModel } from '../../staff/models'
@@ -54,4 +54,7 @@ export class MunicipalityModel implements Municipality {
 
   @Field({ nullable: true })
   readonly navPassword?: string
+
+  @Field(() => String)
+  readonly childrenAid!: ChildrenAid
 }

apps/financial-aid/backend/migrations/20240517093323-update-muni-settings.js

@@ -0,0 +1,30 @@
+'use strict'
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction((t) =>
+      Promise.all([
+        queryInterface.addColumn(
+          'municipality',
+          'children_aid',
+          {
+            type: Sequelize.ENUM('NotDefined', 'Institution', 'Applicant'),
+            allowNull: false,
+            defaultValue: 'NotDefined',
+          },
+          { transaction: t },
+        ),
+      ]),
+    )
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction((t) =>
+      Promise.all([
+        queryInterface.removeColumn('municipality', 'children_aid', {
+          transaction: t,
+        }),
+      ]),
+    )
+  },
+}

apps/financial-aid/backend/src/app/modules/municipality/dto/updateMunicipality.dto.ts

@@ -1,7 +1,7 @@
 import { IsBoolean, IsObject, IsOptional, IsString } from 'class-validator'
 
 import { ApiProperty } from '@nestjs/swagger'
-import type { Aid } from '@island.is/financial-aid/shared/lib'
+import type { Aid, ChildrenAid } from '@island.is/financial-aid/shared/lib'
 
 export class UpdateMunicipalityDto {
   @IsOptional()
@@ -49,6 +49,11 @@ export class UpdateMunicipalityDto {
   @ApiProperty()
   navPassword?: string
 
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  childrenAid?: ChildrenAid
+
   @IsString()
   @ApiProperty()
   readonly municipalityId: string

apps/financial-aid/backend/src/app/modules/municipality/models/municipality.model.ts

@@ -11,7 +11,7 @@ import {
 
 import { ApiProperty } from '@nestjs/swagger'
 
-import { Municipality } from '@island.is/financial-aid/shared/lib'
+import { ChildrenAid, Municipality } from '@island.is/financial-aid/shared/lib'
 
 import { AidModel } from '../../aid/models'
 @Table({
@@ -132,4 +132,12 @@ export class MunicipalityModel extends Model<Municipality> {
   })
   @ApiProperty()
   navPassword?: string
+
+  @Column({
+    type: DataType.ENUM,
+    allowNull: false,
+    values: Object.values(ChildrenAid),
+  })
+  @ApiProperty({ enum: ChildrenAid })
+  childrenAid: ChildrenAid
 }

apps/financial-aid/web-veita/graphql/sharedGql.ts

@@ -469,6 +469,7 @@ export const UpdateMunicipalityMutation = gql`
       navUrl
       navUsername
       navPassword
+      childrenAid
       individualAid {
         ownPlace
         registeredRenting

apps/financial-aid/web-veita/src/components/MunicipalityAdminSettings/MunicipalityAdminSettings.tsx

@@ -6,12 +6,14 @@ import {
   Button,
   ToastContainer,
   Checkbox,
+  RadioButton,
 } from '@island.is/island-ui/core'
 
 import {
   Aid,
   AidName,
   ApiKeysForMunicipality,
+  ChildrenAid,
   Municipality,
   scrollToId,
 } from '@island.is/financial-aid/shared/lib'
@@ -379,6 +381,50 @@ const MunicipalityAdminSettings = ({ currentMunicipality }: Props) => {
         )
       })}
 
+      <Box marginBottom={[2, 2, 7]} id="childrenAid" className={`contentUp`}>
+        <Text as="h3" variant="h3" marginBottom={[2, 2, 3]} color="dark300">
+          Börn
+        </Text>
+        <Box
+          display="flex"
+          alignItems="center"
+          width="full"
+          columnGap={3}
+          rowGap={3}
+          flexWrap={'wrap'}
+        >
+          <Box flexGrow={1}>
+            <RadioButton
+              name="children-aid-institution"
+              label="Styrkur greiddur til stofnunar"
+              value={ChildrenAid.INSTITUTION}
+              checked={state.childrenAid === ChildrenAid.INSTITUTION}
+              onChange={() => {
+                setState({ ...state, childrenAid: ChildrenAid.INSTITUTION })
+              }}
+              backgroundColor="blue"
+              large
+            />
+          </Box>
+          <Box flexGrow={1}>
+            <RadioButton
+              name="children-aid-applicant"
+              label="Styrkur greiddur til umsækjanda"
+              value={ChildrenAid.APPLICANT}
+              checked={state.childrenAid === ChildrenAid.APPLICANT}
+              onChange={() => {
+                setState({
+                  ...state,
+                  childrenAid: ChildrenAid.APPLICANT,
+                })
+              }}
+              backgroundColor="blue"
+              large
+            />
+          </Box>
+        </Box>
+      </Box>
+
       <Box display="flex" justifyContent="flexEnd">
         <Button loading={loading} onClick={submit} icon="checkmark">
           Vista stillingar

apps/financial-aid/web-veita/src/utils/useCurrentMunicipalityState.ts

@@ -35,6 +35,7 @@ const useCurrentMunicipalityState = ({ municipality }: Props) => {
             : state.navUrl,
           navUsername: state.navUsername,
           navPassword: state.navPassword,
+          childrenAid: state.childrenAid,
         },
       },
     })

apps/financial-aid/web-veita/src/utils/useMunicipalities.ts

@@ -21,6 +21,7 @@ const MunicipalityQuery = gql`
       navUrl
       navUsername
       navPassword
+      childrenAid
       individualAid {
         ownPlace
         registeredRenting

apps/judicial-system/api/src/app/modules/defendant/dto/updateDefendant.input.ts

@@ -82,4 +82,9 @@ export class UpdateDefendantInput {
   @IsOptional()
   @Field(() => ServiceRequirement, { nullable: true })
   readonly serviceRequirement?: ServiceRequirement
+
+  @Allow()
+  @IsOptional()
+  @Field(() => String, { nullable: true })
+  readonly verdictViewDate?: string
 }

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

@@ -62,4 +62,7 @@ export class Defendant {
 
   @Field(() => ServiceRequirement, { nullable: true })
   readonly serviceRequirement?: ServiceRequirement
+
+  @Field(() => String, { nullable: true })
+  readonly verdictViewDate?: string
 }

apps/judicial-system/backend/migrations/20240514111505-update-defendant.js

@@ -0,0 +1,22 @@
+'use strict'
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.addColumn(
+        'defendant',
+        'verdict_view_date',
+        { type: Sequelize.DATE, allowNull: true },
+        { transaction: t },
+      ),
+    )
+  },
+
+  down: (queryInterface) => {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.removeColumn('defendant', 'verdict_view_date', {
+        transaction: t,
+      }),
+    )
+  },
+}

apps/judicial-system/backend/src/app/messages/notifications.ts

@@ -297,22 +297,22 @@ export const notifications = {
   }),
   caseCompleted: defineMessages({
     subject: {
-      id: 'judicial.system.backend:notifications.case_completed.subject',
-      defaultMessage: 'Dómur í máli {courtCaseNumber}',
+      id: 'judicial.system.backend:notifications.case_completed.subject_v1',
+      defaultMessage: 'Máli lokið {courtCaseNumber}',
       description:
         'Notaður sem titill í pósti til hagaðila vegna staðfests dóms',
     },
     prosecutorBody: {
-      id: 'judicial.system.backend:notifications.case_completed.prosecutor_body',
+      id: 'judicial.system.backend:notifications.case_completed.prosecutor_body_v1',
       defaultMessage:
-        'Dómari hefur staðfest dóm í máli {courtCaseNumber} hjá {courtName}.<br /><br />Skjöl málsins eru aðengileg á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}.',
+        'Máli {courtCaseNumber} hjá {courtName} hefur verið lokið.<br /><br />Niðurstaða: {caseIndictmentRulingDecision}<br /><br />Skjöl málsins eru aðengileg á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}.',
       description:
         'Notaður sem texti í pósti til sækjanda vegna staðfests dóms',
     },
     defenderBody: {
-      id: 'judicial.system.backend:notifications.case_completed.defender_body_v2',
+      id: 'judicial.system.backend:notifications.case_completed.defender_body_v3',
       defaultMessage:
-        'Dómari hefur staðfest dóm í máli {courtCaseNumber} hjá {courtName}.<br /><br />{defenderHasAccessToRvg, select, false {Þú getur nálgast gögn málsins hjá {courtName} ef þau hafa ekki þegar verið afhent} other {Þú getur nálgast gögn málsins á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}}}.',
+        'Máli {courtCaseNumber} hjá {courtName} hefur verið lokið.<br /><br />Niðurstaða: {caseIndictmentRulingDecision}<br /><br />{defenderHasAccessToRvg, select, false {Þú getur nálgast gögn málsins hjá {courtName} ef þau hafa ekki þegar verið afhent} other {Þú getur nálgast gögn málsins á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}}}.',
       description:
         'Notaður sem texti í pósti til verjanda vegna staðfests dóms',
     },

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

@@ -27,6 +27,7 @@ import {
   districtCourtRegistrarRule,
   prosecutorRepresentativeRule,
   prosecutorRule,
+  publicProsecutorStaffRule,
 } from '../../guards'
 import { Case, CaseExistsGuard, CaseWriteGuard, CurrentCase } from '../case'
 import { CreateDefendantDto } from './dto/createDefendant.dto'
@@ -71,6 +72,7 @@ export class DefendantController {
     districtCourtJudgeRule,
     districtCourtRegistrarRule,
     districtCourtAssistantRule,
+    publicProsecutorStaffRule,
   )
   @Patch(':defendantId')
   @ApiOkResponse({

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

@@ -73,4 +73,9 @@ export class UpdateDefendantDto {
   @IsEnum(ServiceRequirement)
   @ApiPropertyOptional({ enum: ServiceRequirement })
   readonly serviceRequirement?: ServiceRequirement
+
+  @IsOptional()
+  @IsString()
+  @ApiPropertyOptional()
+  readonly verdictViewDate?: string
 }

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

@@ -113,4 +113,11 @@ export class Defendant extends Model {
   })
   @ApiProperty({ enum: ServiceRequirement })
   serviceRequirement?: ServiceRequirement
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: true,
+  })
+  @ApiProperty()
+  verdictViewDate?: string
 }

apps/judicial-system/backend/src/app/modules/defendant/test/defendantController/updateRolesRules.spec.ts

@@ -4,6 +4,7 @@ import {
   districtCourtRegistrarRule,
   prosecutorRepresentativeRule,
   prosecutorRule,
+  publicProsecutorStaffRule,
 } from '../../../../guards'
 import { DefendantController } from '../../defendant.controller'
 
@@ -19,11 +20,12 @@ describe('DefendantController - Update rules', () => {
   })
 
   it('should give permission to roles', () => {
-    expect(rules).toHaveLength(5)
+    expect(rules).toHaveLength(6)
     expect(rules).toContain(prosecutorRule)
     expect(rules).toContain(prosecutorRepresentativeRule)
     expect(rules).toContain(districtCourtJudgeRule)
     expect(rules).toContain(districtCourtRegistrarRule)
     expect(rules).toContain(districtCourtAssistantRule)
+    expect(rules).toContain(publicProsecutorStaffRule)
   })
 })

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

@@ -27,6 +27,7 @@ import {
 import {
   formatDate,
   getAppealResultTextByValue,
+  getHumanReadableCaseIndictmentRulingDecision,
 } from '@island.is/judicial-system/formatters'
 import {
   CaseMessage,
@@ -963,6 +964,10 @@ export class NotificationService {
         ? this.formatMessage(notifications.caseCompleted.prosecutorBody, {
             courtCaseNumber: theCase.courtCaseNumber,
             courtName: theCase.court?.name?.replace('dómur', 'dómi'),
+            caseIndictmentRulingDecision:
+              getHumanReadableCaseIndictmentRulingDecision(
+                theCase.indictmentRulingDecision,
+              ),
             linkStart: `<a href="${this.config.clientUrl}${CLOSED_INDICTMENT_OVERVIEW_ROUTE}/${theCase.id}">`,
             linkEnd: '</a>',
           })
@@ -997,6 +1002,10 @@ export class NotificationService {
         ? this.formatMessage(notifications.caseCompleted.defenderBody, {
             courtCaseNumber: theCase.courtCaseNumber,
             courtName: theCase.court?.name?.replace('dómur', 'dómi'),
+            caseIndictmentRulingDecision:
+              getHumanReadableCaseIndictmentRulingDecision(
+                theCase.indictmentRulingDecision,
+              ),
             defenderHasAccessToRvg: Boolean(defenderNationalId),
             linkStart: `<a href="${formatDefenderRoute(
               this.config.clientUrl,

apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRulingNotifications.spec.ts

@@ -107,8 +107,8 @@ describe('InternalNotificationController - Send ruling notifications', () => {
       expect(mockEmailService.sendEmail).toHaveBeenCalledWith(
         expect.objectContaining({
           to: [{ name: prosecutor.name, address: prosecutor.email }],
-          subject: 'Dómur í máli 007-2022-07',
-          html: `Dómari hefur staðfest dóm í máli 007-2022-07 hjá Héraðsdómi Reykjavíkur.<br /><br />Skjöl málsins eru aðengileg á ${expectedLink}yfirlitssíðu málsins í Réttarvörslugátt</a>.`,
+          subject: 'Máli lokið 007-2022-07',
+          html: `Máli 007-2022-07 hjá Héraðsdómi Reykjavíkur hefur verið lokið.<br /><br />Niðurstaða: Ekki skráð<br /><br />Skjöl málsins eru aðengileg á ${expectedLink}yfirlitssíðu málsins í Réttarvörslugátt</a>.`,
         }),
       )
     })

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

@@ -23,6 +23,7 @@ query Case($input: CaseQueryInput!) {
       defendantWaivesRightToCounsel
       defendantPlea
       serviceRequirement
+      verdictViewDate
     }
     defenderName
     defenderNationalId

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

@@ -28,6 +28,7 @@ query LimitedAccessCase($input: CaseQueryInput!) {
       defenderEmail
       defenderPhoneNumber
       defendantWaivesRightToCounsel
+      verdictViewDate
     }
     defenderName
     defenderNationalId