{spokespersonHasAccessToRVG, select, true {Sjá nánar á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}} other {Þú getur nálgast málið hjá dómstólnum.}}.', - description: - 'Body of the notification when a civil claimant spokesperson is assigned and confirmed', - }), -} diff --git a/apps/judicial-system/backend/src/app/modules/notification/defendantNotification.service.ts b/apps/judicial-system/backend/src/app/modules/notification/defendantNotification.service.ts index d3f6a0f86f2b..5249a63c693d 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/defendantNotification.service.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/defendantNotification.service.ts @@ -1,3 +1,5 @@ +import { MessageDescriptor } from '@formatjs/intl' + import { Inject, Injectable, @@ -10,10 +12,7 @@ import { EmailService } from '@island.is/email-service' import { type Logger, LOGGER_PROVIDER } from '@island.is/logging' import { type ConfigType } from '@island.is/nest/config' -import { - DEFENDER_INDICTMENT_ROUTE, - ROUTE_HANDLER_ROUTE, -} from '@island.is/judicial-system/consts' +import { DEFENDER_INDICTMENT_ROUTE } from '@island.is/judicial-system/consts' import { DefendantNotificationType, isIndictmentCase, @@ -51,27 +50,39 @@ export class DefendantNotificationService extends BaseNotificationService { } private async sendEmails( + defendant: Defendant, theCase: Case, notificationType: DefendantNotificationType, - subject: string, - body: string, - to: { name?: string; email?: string }[], + subject: MessageDescriptor, + body: MessageDescriptor, ) { + const courtName = theCase.court?.name + const defenderHasAccessToRVG = !!defendant.defenderNationalId + + const formattedSubject = this.formatMessage(subject, { + courtName, + }) + + const formattedBody = this.formatMessage(body, { + courtName, + courtCaseNumber: theCase.courtCaseNumber, + defenderHasAccessToRVG, + linkStart: ``, + linkEnd: '', + }) const promises: Promise
Sjá nánar á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}.', - description: - 'Body of the notification sent when the defendant defender choise in an indictment has changed', - }), defenderAssignedSubject: defineMessage({ id: 'judicial.system.backend:defendant_notifications.indictment_defender_assigned_subject', defaultMessage: '{courtName} - aðgangur að máli', diff --git a/apps/judicial-system/backend/src/app/modules/notification/dto/civilClaimantNotification.dto.ts b/apps/judicial-system/backend/src/app/modules/notification/dto/civilClaimantNotification.dto.ts deleted file mode 100644 index 5557dbdfe354..000000000000 --- a/apps/judicial-system/backend/src/app/modules/notification/dto/civilClaimantNotification.dto.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { IsEnum, IsNotEmpty } from 'class-validator' - -import { ApiProperty } from '@nestjs/swagger' - -import { CivilClaimantNotificationType } from '@island.is/judicial-system/types' - -export class CivilClaimantNotificationDto { - @IsNotEmpty() - @IsEnum(CivilClaimantNotificationType) - @ApiProperty({ enum: CivilClaimantNotificationType }) - readonly type!: CivilClaimantNotificationType -} diff --git a/apps/judicial-system/backend/src/app/modules/notification/internalNotification.controller.ts b/apps/judicial-system/backend/src/app/modules/notification/internalNotification.controller.ts index c0e2ca1a0003..f5def84647e3 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/internalNotification.controller.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/internalNotification.controller.ts @@ -18,24 +18,15 @@ import { } from '@island.is/judicial-system/message' import { Case, CaseHasExistedGuard, CurrentCase } from '../case' -import { - CivilClaimant, - CivilClaimantExistsGuard, - CurrentCivilClaimant, - CurrentDefendant, - Defendant, - DefendantExistsGuard, -} from '../defendant' +import { CurrentDefendant, Defendant, DefendantExistsGuard } from '../defendant' import { SubpoenaExistsGuard } from '../subpoena' import { CaseNotificationDto } from './dto/caseNotification.dto' -import { CivilClaimantNotificationDto } from './dto/civilClaimantNotification.dto' import { DefendantNotificationDto } from './dto/defendantNotification.dto' import { InstitutionNotificationDto } from './dto/institutionNotification.dto' import { NotificationDispatchDto } from './dto/notificationDispatch.dto' import { SubpoenaNotificationDto } from './dto/subpoenaNotification.dto' import { DeliverResponse } from './models/deliver.response' import { CaseNotificationService } from './caseNotification.service' -import { CivilClaimantNotificationService } from './civilClaimantNotification.service' import { DefendantNotificationService } from './defendantNotification.service' import { InstitutionNotificationService } from './institutionNotification.service' import { NotificationDispatchService } from './notificationDispatch.service' @@ -51,7 +42,6 @@ export class InternalNotificationController { private readonly institutionNotificationService: InstitutionNotificationService, private readonly subpoenaNotificationService: SubpoenaNotificationService, private readonly defendantNotificationService: DefendantNotificationService, - private readonly civilClaimantNotificationService: CivilClaimantNotificationService, @Inject(LOGGER_PROVIDER) private readonly logger: Logger, ) {} @@ -128,35 +118,7 @@ export class InternalNotificationController { return this.defendantNotificationService.sendDefendantNotification( notificationDto.type, - theCase, defendant, - ) - } - - @Post( - `case/:caseId/${ - messageEndpoint[MessageType.CIVIL_CLAIMANT_NOTIFICATION] - }/:civilClaimantId`, - ) - @UseGuards(CaseHasExistedGuard, CivilClaimantExistsGuard) - @ApiCreatedResponse({ - type: DeliverResponse, - description: 'Sends civil claimant related notifications', - }) - sendCivilClaimantNotification( - @Param('caseId') caseId: string, - @Param('civilClaimantId') civilClaimantId: string, - @CurrentCase() theCase: Case, - @CurrentCivilClaimant() civilClaimant: CivilClaimant, - @Body() notificationDto: CivilClaimantNotificationDto, - ): Promise
Sjá nánar á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}.', + description: + 'Body of the notification sent when the serive status in an indictment has changed', + }), } diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/createTestingNotificationModule.ts b/apps/judicial-system/backend/src/app/modules/notification/test/createTestingNotificationModule.ts index fe4c450c5873..a269d181001b 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/test/createTestingNotificationModule.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/test/createTestingNotificationModule.ts @@ -4,7 +4,7 @@ import { uuid } from 'uuidv4' import { getModelToken } from '@nestjs/sequelize' import { Test } from '@nestjs/testing' -import { FormatMessage, IntlService } from '@island.is/cms-translations' +import { IntlService } from '@island.is/cms-translations' import { createTestIntl } from '@island.is/cms-translations/test' import { EmailService } from '@island.is/email-service' import { LOGGER_PROVIDER } from '@island.is/logging' @@ -25,7 +25,6 @@ import { eventModuleConfig, EventService } from '../../event' import { InstitutionService } from '../../institution' import { UserService } from '../../user' import { CaseNotificationService } from '../caseNotification.service' -import { CivilClaimantNotificationService } from '../civilClaimantNotification.service' import { DefendantNotificationService } from '../defendantNotification.service' import { InstitutionNotificationService } from '../institutionNotification.service' import { InternalNotificationController } from '../internalNotification.controller' @@ -37,30 +36,6 @@ import { NotificationDispatchService } from '../notificationDispatch.service' jest.mock('@island.is/judicial-system/message') -export const createTestUsers = ( - roles: string[], -): Record< - string, - { - id: string - name: string - email: string - mobile: string - nationalId: string - } -> => - roles.reduce((acc, role) => { - const id = uuid() - acc[role] = { - id: id, - name: `${role}-${id}`, - email: `${role}-${id}@omnitrix.is`, - mobile: id, - nationalId: '1234567890', - } - return acc - }, {} as Record
Sjá nánar á yfirlitssíðu málsins í Réttarvörslugátt.`, + }) + }) + }) + + describe('when the case has civil claims and the advocate is a legal rights protector', () => { + const caseId = uuid() + const civilClaimant = { + hasSpokesperson: true, + spokespersonNationalId: '1234567890', + spokespersonEmail: 'recipient@gmail.com', + spokespersonName: 'John Doe', + spokespersonIsLawyer: false, + } + const theCase = { + id: caseId, + type: CaseType.INDICTMENT, + court, + courtCaseNumber: 'S-123/2022', + civilClaimants: [civilClaimant], + } as Case + + beforeEach(async () => { + await givenWhenThen(caseId, theCase, notificationDTO) + }) + + it('should send correct email', () => { + expect(mockEmailService.sendEmail).toHaveBeenCalledTimes(1) + expect(mockEmailService.sendEmail).toHaveBeenCalledWith({ + from: { + name: mockConfig.email.fromName, + address: mockConfig.email.fromEmail, + }, + to: [ + { + name: civilClaimant.spokespersonName, + address: civilClaimant.spokespersonEmail, + }, + ], + replyTo: { + name: mockConfig.email.replyToName, + address: mockConfig.email.replyToEmail, + }, + attachments: undefined, + subject: `Skráning í máli ${theCase.courtCaseNumber}`, + text: expect.anything(), // same as html but stripped html tags + html: `Héraðsdómur Reykjavíkur hefur skráð þig réttargæslumann einkaréttarkröfuhafa í máli ${theCase.courtCaseNumber}.
Sjá nánar á yfirlitssíðu málsins í Réttarvörslugátt.`, + }) + }) + }) + + describe('when the case has civil claims and civil claimant does not have representation', () => { + const caseId = uuid() + const civilClaimant = { + hasSpokesperson: false, + } + const theCase = { + id: caseId, + type: CaseType.INDICTMENT, + court, + courtCaseNumber: 'S-123/2022', + civilClaimants: [civilClaimant], + } as Case + + beforeEach(async () => { + await givenWhenThen(caseId, theCase, notificationDTO) + }) + + it('should send correct email', () => { + expect(mockEmailService.sendEmail).not.toHaveBeenCalled() + }) + }) + describe('when sending assigned defender notifications in a restriction case', () => { const caseId = uuid() const theCase = { @@ -89,8 +204,8 @@ describe('InternalNotificationController - Send defender assigned notifications' type: CaseType.ADMISSION_TO_FACILITY, court, courtCaseNumber: 'R-123/2022', - defenderEmail: defender.email, - defenderName: defender.name, + defenderEmail: 'recipient@gmail.com', + defenderName: 'John Doe', defenderNationalId: '1234567890', dateLogs: [{ date: new Date(), dateType: DateType.ARRAIGNMENT_DATE }], } as Case @@ -131,8 +246,8 @@ describe('InternalNotificationController - Send defender assigned notifications' type: CaseType.ADMISSION_TO_FACILITY, court, courtCaseNumber: 'R-123/2022', - defenderEmail: defender.email, - defenderName: defender.name, + defenderEmail: 'recipient@gmail.com', + defenderName: 'John Doe', dateLogs: [{ date: new Date(), dateType: DateType.ARRAIGNMENT_DATE }], } as Case @@ -172,8 +287,8 @@ describe('InternalNotificationController - Send defender assigned notifications' type: CaseType.PHONE_TAPPING, court, courtCaseNumber: 'R-123/2022', - defenderEmail: defender.email, - defenderName: defender.name, + defenderEmail: 'recipient@gmail.com', + defenderName: 'John Doe', dateLogs: [{ date: new Date(), dateType: DateType.ARRAIGNMENT_DATE }], } as Case diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendAppealCompletedNotifications.spec.ts b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendAppealCompletedNotifications.spec.ts index df4807508115..bc9c0a684778 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendAppealCompletedNotifications.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendAppealCompletedNotifications.spec.ts @@ -12,10 +12,7 @@ import { User, } from '@island.is/judicial-system/types' -import { - createTestingNotificationModule, - createTestUsers, -} from '../createTestingNotificationModule' +import { createTestingNotificationModule } from '../createTestingNotificationModule' import { Case } from '../../../case' import { DeliverResponse } from '../../models/deliver.response' @@ -32,24 +29,25 @@ type GivenWhenThen = ( ) => Promise
Fyrirtaka mun fara fram á ótilgreindum tíma.
Dómsalur hefur ekki verið skráður.
Dómari hefur ekki verið skráður.
Verjandi sakbornings: ${defender.name}. Hægt er að nálgast yfirlitssíðu málsins á rettarvorslugatt.island.is.`, + html: `Héraðsdómur Reykjavíkur hefur staðfest fyrirtökutíma fyrir kröfu um gæsluvarðhald.
Fyrirtaka mun fara fram á ótilgreindum tíma.
Dómsalur hefur ekki verið skráður.
Dómari hefur ekki verið skráður.
Verjandi sakbornings: ${defenderName}. Hægt er að nálgast yfirlitssíðu málsins á rettarvorslugatt.island.is.`, }), ) expect(mockEmailService.sendEmail).toHaveBeenCalledWith( expect.objectContaining({ - to: [{ name: defender.name, address: defender.email }], + to: [{ name: defenderName, address: defenderEmail }], subject: `Fyrirtaka í máli ${courtCaseNumber}`, - html: `Héraðsdómur Reykjavíkur hefur boðað þig í fyrirtöku sem verjanda sakbornings.
Fyrirtaka mun fara fram á ótilgreindum tíma.
Málsnúmer: ${courtCaseNumber}.
Dómsalur hefur ekki verið skráður.
Dómari: .
Sækjandi: ${prosecutor.name} ().`, + html: `Héraðsdómur Reykjavíkur hefur boðað þig í fyrirtöku sem verjanda sakbornings.
Fyrirtaka mun fara fram á ótilgreindum tíma.
Málsnúmer: ${courtCaseNumber}.
Dómsalur hefur ekki verið skráður.
Dómari: .
Sækjandi: ${prosecutorName} ().`, }), ) expect(mockEmailService.sendEmail).toHaveBeenCalledWith( expect.objectContaining({ - to: [{ name: defender.name, address: defender.email }], + to: [{ name: defenderName, address: defenderEmail }], subject: `Yfirlit máls ${courtCaseNumber}`, }), ) @@ -128,11 +125,11 @@ describe('InternalNotificationController - Send court date notifications', () => const theCase = { id: caseId, type: CaseType.CUSTODY, - prosecutor: { name: prosecutor.name, email: prosecutor.email }, + prosecutor: { name: prosecutorName, email: prosecutorEmail }, court: { name: courtName }, courtCaseNumber, - defenderName: defender.name, - defenderEmail: defender.email, + defenderName, + defenderEmail, } as Case beforeEach(async () => { @@ -145,8 +142,8 @@ describe('InternalNotificationController - Send court date notifications', () => notifications: [ { caseId, - type: NotificationType.READY_FOR_COURT, - recipients: [{ address: defender.email, success: true }], + type: CaseNotificationType.READY_FOR_COURT, + recipients: [{ address: defenderEmail, success: true }], }, ], } as Case, @@ -157,7 +154,7 @@ describe('InternalNotificationController - Send court date notifications', () => it('should not send link to case to defender', () => { expect(mockEmailService.sendEmail).not.toHaveBeenCalledWith( expect.objectContaining({ - to: [{ name: defender.name, address: defender.email }], + to: [{ name: defenderName, address: defenderEmail }], subject: `Yfirlit máls ${courtCaseNumber}`, }), ) @@ -178,11 +175,11 @@ describe('InternalNotificationController - Send court date notifications', () => const theCase = { id: caseId, type: CaseType.INDICTMENT, - prosecutor: { name: prosecutor.name, email: prosecutor.email }, + prosecutor: { name: prosecutorName, email: prosecutorEmail }, defendants: [ { - defenderName: defender.name, - defenderEmail: defender.email, + defenderName, + defenderEmail, }, ], court: { name: courtName }, @@ -197,7 +194,7 @@ describe('InternalNotificationController - Send court date notifications', () => it('should send notifications to prosecutor and defender', () => { expect(mockEmailService.sendEmail).toHaveBeenCalledWith( expect.objectContaining({ - to: [{ name: prosecutor.name, address: prosecutor.email }], + to: [{ name: prosecutorName, address: prosecutorEmail }], subject: `Nýtt þinghald í máli ${courtCaseNumber}`, html: `Héraðsdómur Reykjavíkur boðar til þinghalds í máli ${courtCaseNumber}.
Fyrirtaka mun fara fram 2. maí 2024, kl. 14:32.
Tegund þinghalds: Óþekkt.
Dómsalur hefur ekki verið skráður.
Dómari hefur ekki verið skráður.
Hægt er að nálgast gögn málsins á yfirlitssíðu málsins í Réttarvörslugátt.`, }), @@ -205,7 +202,7 @@ describe('InternalNotificationController - Send court date notifications', () => expect(mockEmailService.sendEmail).toHaveBeenCalledWith( expect.objectContaining({ - to: [{ name: defender.name, address: defender.email }], + to: [{ name: defenderName, address: defenderEmail }], subject: `Nýtt þinghald í máli ${courtCaseNumber}`, html: `Héraðsdómur Reykjavíkur boðar til þinghalds í máli ${courtCaseNumber}.
Fyrirtaka mun fara fram 2. maí 2024, kl. 14:32.
Tegund þinghalds: Óþekkt.
Dómsalur hefur ekki verið skráður.
Dómari hefur ekki verið skráður.
Hægt er að nálgast gögn málsins hjá Héraðsdómur Reykjavíkur.`, }), diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendDefendantsNotUpdatedAtCourtNotifications.spec.ts b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendDefendantsNotUpdatedAtCourtNotifications.spec.ts index b0448904d07f..b7090ce986dc 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendDefendantsNotUpdatedAtCourtNotifications.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendDefendantsNotUpdatedAtCourtNotifications.spec.ts @@ -2,16 +2,9 @@ import { uuid } from 'uuidv4' import { EmailService } from '@island.is/email-service' -import { - CaseNotificationType, - NotificationType, - User, -} from '@island.is/judicial-system/types' +import { CaseNotificationType, User } from '@island.is/judicial-system/types' -import { - createTestingNotificationModule, - createTestUsers, -} from '../createTestingNotificationModule' +import { createTestingNotificationModule } from '../createTestingNotificationModule' import { Case } from '../../../case' import { CaseNotificationDto } from '../../dto/caseNotification.dto' @@ -34,15 +27,14 @@ describe('InternalNotificationController - Send defendants not updated at court user: { id: userId } as User, type: CaseNotificationType.DEFENDANTS_NOT_UPDATED_AT_COURT, } - - const { registrar } = createTestUsers(['registrar', 'defender']) const caseId = uuid() const courtCaseNumber = uuid() - + const registrarName = uuid() + const registrarEmail = uuid() const theCase = { id: caseId, courtCaseNumber, - registrar: { name: registrar.name, email: registrar.email }, + registrar: { name: registrarName, email: registrarEmail }, } as Case let mockEmailService: EmailService @@ -80,7 +72,7 @@ describe('InternalNotificationController - Send defendants not updated at court it('should send email', () => { expect(mockEmailService.sendEmail).toHaveBeenCalledWith( expect.objectContaining({ - to: [{ name: registrar.name, address: registrar.email }], + to: [{ name: registrarName, address: registrarEmail }], subject: `Skráning varnaraðila/verjenda í máli ${courtCaseNumber}`, html: `Ekki tókst að skrá varnaraðila/verjendur í máli ${courtCaseNumber} í Auði. Yfirfara þarf málið í Auði og skrá rétta aðila áður en því er lokað.`, }), @@ -99,8 +91,8 @@ describe('InternalNotificationController - Send defendants not updated at court ...theCase, notifications: [ { - type: NotificationType.DEFENDANTS_NOT_UPDATED_AT_COURT, - recipients: [{ address: registrar.email, success: true }], + type: CaseNotificationType.DEFENDANTS_NOT_UPDATED_AT_COURT, + recipients: [{ address: registrarEmail, success: true }], }, ], } as Case, diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendIndictmentDeniedNotifications.spec.ts b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendIndictmentDeniedNotifications.spec.ts index 7efd487f6146..904b873650f9 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendIndictmentDeniedNotifications.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendIndictmentDeniedNotifications.spec.ts @@ -8,10 +8,7 @@ import { User, } from '@island.is/judicial-system/types' -import { - createTestingNotificationModule, - createTestUsers, -} from '../createTestingNotificationModule' +import { createTestingNotificationModule } from '../createTestingNotificationModule' import { Case } from '../../../case' import { CaseNotificationDto } from '../../dto/caseNotification.dto' @@ -32,10 +29,8 @@ type GivenWhenThen = ( describe('InternalNotificationController - Send indictment denied notification', () => { const userId = uuid() const caseId = uuid() - - const { prosecutor } = createTestUsers(['prosecutor']) - const prosecutorName = prosecutor.name - const prosecutorEmail = prosecutor.email + const prosecutorName = uuid() + const prosecutorEmail = uuid() const policeCaseNumbers = [uuid(), uuid()] let mockEmailService: EmailService diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendIndictmentReturnedNotifications.spec.ts b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendIndictmentReturnedNotifications.spec.ts index ee1f6bd106bb..24a9ddba4558 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendIndictmentReturnedNotifications.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendIndictmentReturnedNotifications.spec.ts @@ -8,10 +8,7 @@ import { User, } from '@island.is/judicial-system/types' -import { - createTestingNotificationModule, - createTestUsers, -} from '../createTestingNotificationModule' +import { createTestingNotificationModule } from '../createTestingNotificationModule' import { Case } from '../../../case' import { CaseNotificationDto } from '../../dto/caseNotification.dto' @@ -30,10 +27,10 @@ type GivenWhenThen = ( ) => Promise
Hægt er að nálgast yfirlit og staðfesta ákærur í Réttarvörslugátt.', }), ) expect(mockEmailService.sendEmail).toHaveBeenCalledWith( expect.objectContaining({ - to: [{ name: prosecutor2.name, address: prosecutor2.email }], + to: [{ name: prosecutorName2, address: prosecutorEmail2 }], subject: 'Ákærur bíða staðfestingar', html: 'Í Réttarvörslugátt bíða 2 ákærur staðfestingar.
Hægt er að nálgast yfirlit og staðfesta ákærur í Réttarvörslugátt.', }), diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendReadyForCourtNotifications.spec.ts b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendReadyForCourtNotifications.spec.ts index f9757746c4ad..e1b3b2c1a4c6 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendReadyForCourtNotifications.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendReadyForCourtNotifications.spec.ts @@ -15,15 +15,11 @@ import { CaseType, DateType, IndictmentSubtype, - NotificationType, RequestSharedWithDefender, User, } from '@island.is/judicial-system/types' -import { - createTestingNotificationModule, - createTestUsers, -} from '../createTestingNotificationModule' +import { createTestingNotificationModule } from '../createTestingNotificationModule' import { randomDate } from '../../../../test' import { Case } from '../../../case' @@ -48,29 +44,23 @@ describe('InternalNotificationController - Send ready for court notifications fo const userId = uuid() const caseId = uuid() const policeCaseNumber = uuid() + const courtId = uuid() const courtCaseNumber = uuid() - - const { prosecutor, defender, testCourt } = createTestUsers([ - 'prosecutor', - 'defender', - 'testCourt', - ]) - const theCase = { id: caseId, type: CaseType.CUSTODY, state: CaseState.RECEIVED, policeCaseNumbers: [policeCaseNumber], prosecutor: { - name: prosecutor.name, - email: prosecutor.email, + name: 'Derrick', + email: 'derrick@dummy.is', }, - courtId: testCourt.id, + courtId, court: { name: 'Héraðsdómur Reykjavíkur' }, courtCaseNumber, - defenderNationalId: defender.nationalId, - defenderName: defender.name, - defenderEmail: defender.email, + defenderNationalId: uuid(), + defenderName: 'Saul Goodman', + defenderEmail: 'saul@dummy.is', requestSharedWithDefender: RequestSharedWithDefender.COURT_DATE, prosecutorsOffice: { name: 'Héraðsdómur Derricks' }, dateLogs: [{ date: randomDate(), dateType: DateType.ARRAIGNMENT_DATE }], @@ -79,6 +69,7 @@ describe('InternalNotificationController - Send ready for court notifications fo user: { id: userId } as User, type: CaseNotificationType.READY_FOR_COURT, } + const courtMobileNumber = uuid() let mockEmailService: EmailService let mockSmsService: SmsService @@ -86,7 +77,7 @@ describe('InternalNotificationController - Send ready for court notifications fo let givenWhenThen: GivenWhenThen beforeEach(async () => { - process.env.COURTS_MOBILE_NUMBERS = `{"${testCourt.id}": "${testCourt.mobile}"}` + process.env.COURTS_MOBILE_NUMBERS = `{"${courtId}": "${courtMobileNumber}"}` const { emailService, @@ -128,7 +119,7 @@ describe('InternalNotificationController - Send ready for court notifications fo name: mockNotificationConfig.email.replyToName, address: mockNotificationConfig.email.replyToEmail, }, - to: [{ name: prosecutor.name, address: prosecutor.email }], + to: [{ name: 'Derrick', address: 'derrick@dummy.is' }], subject: 'Krafa um gæsluvarðhald send', text: `Þú hefur sent kröfu á Héraðsdóm Reykjavíkur vegna LÖKE máls ${policeCaseNumber}. Skjalið er aðgengilegt undir málinu í Réttarvörslugátt.`, html: `Þú hefur sent kröfu á Héraðsdóm Reykjavíkur vegna LÖKE máls ${policeCaseNumber}. Skjalið er aðgengilegt undir málinu í Réttarvörslugátt.`, @@ -138,8 +129,8 @@ describe('InternalNotificationController - Send ready for court notifications fo it('should send ready for court sms notification to court', () => { expect(mockSmsService.sendSms).toHaveBeenCalledWith( - [testCourt.mobile], - `Gæsluvarðhaldskrafa tilbúin til afgreiðslu. Sækjandi: ${prosecutor.name} (Héraðsdómur Derricks). Sjá nánar á rettarvorslugatt.island.is.`, + [courtMobileNumber], + 'Gæsluvarðhaldskrafa tilbúin til afgreiðslu. Sækjandi: Derrick (Héraðsdómur Derricks). Sjá nánar á rettarvorslugatt.island.is.', ) }) @@ -157,13 +148,11 @@ describe('InternalNotificationController - Send ready for court notifications fo notifications: [ { caseId, - type: NotificationType.READY_FOR_COURT, + type: CaseNotificationType.READY_FOR_COURT, recipients: [ { address: - mockNotificationConfig.sms.courtsMobileNumbers[ - testCourt.id - ], + mockNotificationConfig.sms.courtsMobileNumbers[courtId], success: true, }, ], @@ -184,7 +173,7 @@ describe('InternalNotificationController - Send ready for court notifications fo name: mockNotificationConfig.email.replyToName, address: mockNotificationConfig.email.replyToEmail, }, - to: [{ name: prosecutor.name, address: prosecutor.email }], + to: [{ name: 'Derrick', address: 'derrick@dummy.is' }], subject: 'Krafa um gæsluvarðhald send', text: `Þú hefur sent kröfu á Héraðsdóm Reykjavíkur vegna LÖKE máls ${policeCaseNumber}. Skjalið er aðgengilegt undir málinu í Réttarvörslugátt.`, html: `Þú hefur sent kröfu á Héraðsdóm Reykjavíkur vegna LÖKE máls ${policeCaseNumber}. Skjalið er aðgengilegt undir málinu í Réttarvörslugátt.`, @@ -194,7 +183,7 @@ describe('InternalNotificationController - Send ready for court notifications fo it('should send ready for court sms notification to court', () => { expect(mockSmsService.sendSms).toHaveBeenCalledWith( - [testCourt.mobile], + [courtMobileNumber], `Sækjandi í máli ${courtCaseNumber} hefur breytt kröfunni og sent aftur á héraðsdómstól. Nýtt kröfuskjal hefur verið vistað í Auði. Sjá nánar á rettarvorslugatt.island.is.`, ) }) @@ -202,7 +191,7 @@ describe('InternalNotificationController - Send ready for court notifications fo it('should not send ready for court email notification to defender', () => { expect(mockEmailService.sendEmail).not.toHaveBeenCalledWith( expect.objectContaining({ - to: [{ name: defender.name, address: defender.email }], + to: [{ name: 'Saul Goodman', address: 'saul@dummy.is' }], }), ) }) @@ -235,8 +224,8 @@ describe('InternalNotificationController - Send ready for court notifications fo ...theCase, notifications: [ { - type: NotificationType.READY_FOR_COURT, - recipients: [{ address: defender.email, success: true }], + type: CaseNotificationType.READY_FOR_COURT, + recipients: [{ address: 'saul@dummy.is', success: true }], }, ], } as Case, @@ -256,7 +245,7 @@ describe('InternalNotificationController - Send ready for court notifications fo name: mockNotificationConfig.email.replyToName, address: mockNotificationConfig.email.replyToEmail, }, - to: [{ name: defender.name, address: defender.email }], + to: [{ name: 'Saul Goodman', address: 'saul@dummy.is' }], subject: `Krafa í máli ${courtCaseNumber}`, html: `Sækjandi í máli ${courtCaseNumber} hjá Héraðsdómi Reykjavíkur hefur breytt kröfunni og sent hana aftur á dóminn.
Þú getur nálgast gögn málsins á yfirlitssíðu málsins í Réttarvörslugátt.`, attachments: undefined, @@ -268,8 +257,8 @@ describe('InternalNotificationController - Send ready for court notifications fo describe('InternalNotificationController - Send ready for court notifications for indictment cases', () => { const userId = uuid() - const { testCourt } = createTestUsers(['testCourt']) - + const courtId = uuid() + const courtEmail = uuid() const notificationDto = { user: { id: userId } as User, type: CaseNotificationType.READY_FOR_COURT, @@ -281,7 +270,7 @@ describe('InternalNotificationController - Send ready for court notifications fo let givenWhenThen: GivenWhenThen beforeEach(async () => { - process.env.COURTS_EMAILS = `{"${testCourt.id}": "${testCourt.email}"}` + process.env.COURTS_EMAILS = `{"${courtId}": "${courtEmail}"}` const { emailService, @@ -309,9 +298,8 @@ describe('InternalNotificationController - Send ready for court notifications fo describe('indictment notification with single indictment subtype', () => { const caseId = uuid() const policeCaseNumbers = [uuid()] - const court = { - id: testCourt.id, + id: courtId, name: 'Héraðsdómur Reykjavíkur', } as Institution const prosecutorsOffice = { name: 'Lögreglan á höfuðborgarsvæðinu' } @@ -324,7 +312,7 @@ describe('InternalNotificationController - Send ready for court notifications fo indictmentSubtypes: { [policeCaseNumbers[0]]: [IndictmentSubtype.MURDER], }, - courtId: court.id, + courtId, court, prosecutorsOffice, } as unknown as Case @@ -339,7 +327,7 @@ describe('InternalNotificationController - Send ready for court notifications fo to: [ { name: 'Héraðsdómur Reykjavíkur', - address: testCourt.email, + address: courtEmail, }, ], subject: 'Ákæra tilbúin til afgreiðslu', @@ -349,9 +337,7 @@ describe('InternalNotificationController - Send ready for court notifications fo expect(mockNotificationModel.create).toHaveBeenCalledWith({ caseId, type: CaseNotificationType.READY_FOR_COURT, - recipients: [ - { success: true, address: testCourt.email }, - ] as Recipient[], + recipients: [{ success: true, address: courtEmail }] as Recipient[], }) }) }) @@ -360,7 +346,7 @@ describe('InternalNotificationController - Send ready for court notifications fo const caseId = uuid() const policeCaseNumbers = [uuid(), uuid()] const court = { - id: testCourt.id, + id: courtId, name: 'Héraðsdómur Reykjavíkur', } as Institution const prosecutorsOffice = { name: 'Lögreglan á höfuðborgarsvæðinu' } @@ -380,7 +366,7 @@ describe('InternalNotificationController - Send ready for court notifications fo IndictmentSubtype.THEFT, ], }, - courtId: court.id, + courtId, court, prosecutorsOffice, } as unknown as Case @@ -395,7 +381,7 @@ describe('InternalNotificationController - Send ready for court notifications fo to: [ { name: 'Héraðsdómur Reykjavíkur', - address: testCourt.email, + address: courtEmail, }, ], subject: 'Ákæra tilbúin til afgreiðslu', @@ -405,9 +391,7 @@ describe('InternalNotificationController - Send ready for court notifications fo expect(mockNotificationModel.create).toHaveBeenCalledWith({ caseId, type: CaseNotificationType.READY_FOR_COURT, - recipients: [ - { success: true, address: testCourt.email }, - ] as Recipient[], + recipients: [{ success: true, address: courtEmail }] as Recipient[], }) }) }) diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRevokedNotifications.spec.ts b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRevokedNotifications.spec.ts index 274a52a42c74..c585586d5c1d 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRevokedNotifications.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRevokedNotifications.spec.ts @@ -2,15 +2,9 @@ import { uuid } from 'uuidv4' import { EmailService } from '@island.is/email-service' -import { - CaseNotificationType, - NotificationType, -} from '@island.is/judicial-system/types' +import { CaseNotificationType } from '@island.is/judicial-system/types' -import { - createTestingNotificationModule, - createTestUsers, -} from '../createTestingNotificationModule' +import { createTestingNotificationModule } from '../createTestingNotificationModule' import { Case } from '../../../case' import { CaseNotificationDto } from '../../dto/caseNotification.dto' @@ -25,27 +19,22 @@ interface Then { type GivenWhenThen = (notifications?: Notification[]) => Promise
Sjá nánar á yfirlitssíðu málsins í Réttarvörslugátt.`, }), @@ -116,9 +105,9 @@ describe('InternalNotificationController - Send revoked notifications for indict caseId: caseId, type: CaseNotificationType.REVOKED, recipients: [ - { address: judge.email, success: true }, - { address: registrar.email, success: true }, - { address: defender.email, success: true }, + { address: judgeEmail, success: true }, + { address: registrarEmail, success: true }, + { address: defenderEmail, success: true }, ], }) expect(then.result).toEqual({ delivered: true }) diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRulingNotifications.spec.ts b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRulingNotifications.spec.ts index 6959fde99979..26ccba06fa36 100644 --- a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRulingNotifications.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendRulingNotifications.spec.ts @@ -16,10 +16,7 @@ import { User, } from '@island.is/judicial-system/types' -import { - createTestingNotificationModule, - createTestUsers, -} from '../createTestingNotificationModule' +import { createTestingNotificationModule } from '../createTestingNotificationModule' import { Case } from '../../../case' import { Defendant, DefendantService } from '../../../defendant' @@ -46,7 +43,6 @@ describe('InternalNotificationController - Send ruling notifications', () => { user: { id: userId } as User, type: CaseNotificationType.RULING, } - const { testProsecutor } = createTestUsers(['testProsecutor']) let mockEmailService: EmailService let mockConfig: ConfigType
Skjöl málsins eru aðgengileg á ${expectedLink}yfirlitssíðu málsins í Réttarvörslugátt.`, }), diff --git a/apps/judicial-system/backend/src/app/modules/subpoena/dto/updateSubpoena.dto.ts b/apps/judicial-system/backend/src/app/modules/subpoena/dto/updateSubpoena.dto.ts index 89e83477f4a2..80603c97865d 100644 --- a/apps/judicial-system/backend/src/app/modules/subpoena/dto/updateSubpoena.dto.ts +++ b/apps/judicial-system/backend/src/app/modules/subpoena/dto/updateSubpoena.dto.ts @@ -1,4 +1,4 @@ -import { IsEnum, IsOptional, IsString, MaxLength } from 'class-validator' +import { IsBoolean, IsEnum, IsOptional, IsString } from 'class-validator' import { ApiPropertyOptional } from '@nestjs/swagger' @@ -11,7 +11,6 @@ export class UpdateSubpoenaDto { readonly serviceStatus?: ServiceStatus @IsOptional() - @MaxLength(255) @IsString() @ApiPropertyOptional({ type: String }) readonly servedBy?: string @@ -32,25 +31,21 @@ export class UpdateSubpoenaDto { readonly defenderChoice?: DefenderChoice @IsOptional() - @MaxLength(255) @IsString() @ApiPropertyOptional({ type: String }) readonly defenderNationalId?: string @IsOptional() - @MaxLength(255) @IsString() @ApiPropertyOptional({ type: String }) readonly defenderName?: string @IsOptional() - @MaxLength(255) @IsString() @ApiPropertyOptional({ type: String }) readonly defenderEmail?: string @IsOptional() - @MaxLength(255) @IsString() @ApiPropertyOptional({ type: String }) readonly defenderPhoneNumber?: string @@ -61,14 +56,17 @@ export class UpdateSubpoenaDto { readonly requestedDefenderChoice?: DefenderChoice @IsOptional() - @MaxLength(255) @IsString() @ApiPropertyOptional({ type: String }) readonly requestedDefenderNationalId?: string @IsOptional() - @MaxLength(255) @IsString() @ApiPropertyOptional({ type: String }) readonly requestedDefenderName?: string + + @IsOptional() + @IsBoolean() + @ApiPropertyOptional({ type: Boolean }) + readonly isDefenderChoiceConfirmed?: boolean } diff --git a/apps/judicial-system/backend/src/app/modules/subpoena/internalSubpoena.controller.ts b/apps/judicial-system/backend/src/app/modules/subpoena/internalSubpoena.controller.ts index 968440871a92..411c8f3e4ef3 100644 --- a/apps/judicial-system/backend/src/app/modules/subpoena/internalSubpoena.controller.ts +++ b/apps/judicial-system/backend/src/app/modules/subpoena/internalSubpoena.controller.ts @@ -33,7 +33,7 @@ import { DeliverResponse } from './models/deliver.response' import { Subpoena } from './models/subpoena.model' import { SubpoenaService } from './subpoena.service' -@Controller('api/internal') +@Controller('api/internal/') @ApiTags('internal subpoenas') @UseGuards(TokenGuard) export class InternalSubpoenaController { diff --git a/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.controller.ts b/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.controller.ts index da139a356906..da84d9c66c59 100644 --- a/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.controller.ts +++ b/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.controller.ts @@ -5,6 +5,7 @@ import { Get, Header, Inject, + InternalServerErrorException, Param, Query, Res, diff --git a/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.module.ts b/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.module.ts index 31fba1e49734..57b9d55af2be 100644 --- a/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.module.ts +++ b/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.module.ts @@ -4,7 +4,6 @@ import { SequelizeModule } from '@nestjs/sequelize' import { MessageModule } from '@island.is/judicial-system/message' import { CaseModule } from '../case/case.module' -import { DefendantModule } from '../defendant/defendant.module' import { Defendant } from '../defendant/models/defendant.model' import { EventModule } from '../event/event.module' import { FileModule } from '../file/file.module' @@ -22,7 +21,7 @@ import { SubpoenaService } from './subpoena.service' forwardRef(() => FileModule), forwardRef(() => MessageModule), forwardRef(() => EventModule), - forwardRef(() => DefendantModule), + SequelizeModule.forFeature([Subpoena, Defendant]), ], controllers: [ diff --git a/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.service.ts b/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.service.ts index 64fc48de8dc9..9f7322f11fe3 100644 --- a/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.service.ts +++ b/apps/judicial-system/backend/src/app/modules/subpoena/subpoena.service.ts @@ -20,6 +20,7 @@ import { } from '@island.is/judicial-system/message' import { CaseFileCategory, + DefenderChoice, isFailedServiceStatus, isSuccessfulServiceStatus, isTrafficViolationCase, @@ -30,7 +31,6 @@ import { import { Case } from '../case/models/case.model' import { PdfService } from '../case/pdf.service' -import { DefendantService } from '../defendant/defendant.service' import { Defendant } from '../defendant/models/defendant.model' import { EventService } from '../event' import { FileService } from '../file' @@ -61,7 +61,9 @@ export const include: Includeable[] = [ @Injectable() export class SubpoenaService { constructor( + @InjectConnection() private readonly sequelize: Sequelize, @InjectModel(Subpoena) private readonly subpoenaModel: typeof Subpoena, + @InjectModel(Defendant) private readonly defendantModel: typeof Defendant, private readonly pdfService: PdfService, private readonly messageService: MessageService, @Inject(forwardRef(() => PoliceService)) @@ -69,7 +71,6 @@ export class SubpoenaService { @Inject(forwardRef(() => FileService)) private readonly fileService: FileService, private readonly eventService: EventService, - private readonly defendantService: DefendantService, @Inject(LOGGER_PROVIDER) private readonly logger: Logger, ) {} @@ -110,36 +111,53 @@ export class SubpoenaService { private async addMessagesForSubpoenaUpdateToQueue( subpoena: Subpoena, serviceStatus?: ServiceStatus, + defenderChoice?: DefenderChoice, + defenderNationalId?: string, ): Promise
- )}
- {requiredMessage}
-
-
- {formatMessage(filesText.errorMessage)}
-
-
- -
{data.vehicleCoOwnerChangeValidation.errorMessages.map(
(error: OwnerChangeValidationMessage) => {
const message = formatMessage(
@@ -95,13 +80,15 @@ export const ValidationErrorMessages: FC<
error?.errorNo
return (
-
-
+
+ {message || defaultMessage || fallbackMessage} + +
)
},
)}
-
+
+ )
+}
diff --git a/libs/application/templates/transport-authority/change-co-owner-of-vehicle/src/fields/VehiclesField/index.tsx b/libs/application/templates/transport-authority/change-co-owner-of-vehicle/src/fields/VehiclesField/index.tsx
index 11c7b5ca4819..3adad308746b 100644
--- a/libs/application/templates/transport-authority/change-co-owner-of-vehicle/src/fields/VehiclesField/index.tsx
+++ b/libs/application/templates/transport-authority/change-co-owner-of-vehicle/src/fields/VehiclesField/index.tsx
@@ -6,14 +6,12 @@ import {
import { Box } from '@island.is/island-ui/core'
import { FC, useCallback, useEffect } from 'react'
import { CurrentVehiclesAndRecords } from '../../shared'
+import { VehicleRadioField } from './VehicleRadioField'
import { useFormContext } from 'react-hook-form'
import { ApolloQueryResult, useMutation } from '@apollo/client'
import { UPDATE_APPLICATION } from '@island.is/application/graphql'
import { useLocale } from '@island.is/localization'
-import {
- FindVehicleFormField,
- VehicleRadioFormField,
-} from '@island.is/application/ui-fields'
+import { FindVehicleFormField } from '@island.is/application/ui-fields'
import { applicationCheck, error, information } from '../../lib/messages'
import { useLazyVehicleDetails } from '../../hooks/useLazyVehicleDetails'
import { VehicleSelectField } from './VehicleSelectField'
@@ -94,27 +92,9 @@ export const VehiclesField: FC-
{data.vehicleOperatorChangeValidation.errorMessages.map(
(error: OperatorChangeValidationMessage) => {
const message = formatMessage(
@@ -97,13 +82,15 @@ export const ValidationErrorMessages: FC<
error?.errorNo
return (
-
-
+
+ {message || defaultMessage || fallbackMessage} + +
)
},
)}
-
+
+ )
+}
diff --git a/libs/application/templates/transport-authority/change-operator-of-vehicle/src/fields/VehiclesField/index.tsx b/libs/application/templates/transport-authority/change-operator-of-vehicle/src/fields/VehiclesField/index.tsx
index 3e0019887e76..7ab26655af07 100644
--- a/libs/application/templates/transport-authority/change-operator-of-vehicle/src/fields/VehiclesField/index.tsx
+++ b/libs/application/templates/transport-authority/change-operator-of-vehicle/src/fields/VehiclesField/index.tsx
@@ -6,14 +6,12 @@ import {
import { Box } from '@island.is/island-ui/core'
import { FC, useCallback, useEffect } from 'react'
import { CurrentVehiclesAndRecords } from '../../shared'
+import { VehicleRadioField } from './VehicleRadioField'
import { useFormContext } from 'react-hook-form'
import { ApolloQueryResult, useMutation } from '@apollo/client'
import { UPDATE_APPLICATION } from '@island.is/application/graphql'
import { useLocale } from '@island.is/localization'
-import {
- FindVehicleFormField,
- VehicleRadioFormField,
-} from '@island.is/application/ui-fields'
+import { FindVehicleFormField } from '@island.is/application/ui-fields'
import { useLazyVehicleDetails } from '../../hooks/useLazyVehicleDetails'
import { applicationCheck, error, information } from '../../lib/messages'
import { VehicleSelectField } from './VehicleSelectField'
@@ -99,27 +97,9 @@ export const VehiclesField: FC
+
+ setRegno(myPlateOwnershipList[parseInt(s, 10)].regno)
+ }
+ />
+
+ )
+}
diff --git a/libs/application/templates/transport-authority/license-plate-renewal/src/fields/PlateField/PlateSelectField.tsx b/libs/application/templates/transport-authority/license-plate-renewal/src/fields/PlateField/PlateSelectField.tsx
index 9ba3b36c4d53..127b4e2b4f66 100644
--- a/libs/application/templates/transport-authority/license-plate-renewal/src/fields/PlateField/PlateSelectField.tsx
+++ b/libs/application/templates/transport-authority/license-plate-renewal/src/fields/PlateField/PlateSelectField.tsx
@@ -1,6 +1,6 @@
import { FieldBaseProps, Option } from '@island.is/application/types'
import { useLocale } from '@island.is/localization'
-import { FC, useCallback, useEffect, useState } from 'react'
+import { FC, useState } from 'react'
import {
Box,
SkeletonLoader,
@@ -8,15 +8,12 @@ import {
Bullet,
BulletList,
ActionCard,
- InputError,
} from '@island.is/island-ui/core'
import { PlateOwnership } from '../../shared'
-import { error, information } from '../../lib/messages'
+import { information } from '../../lib/messages'
import { SelectController } from '@island.is/shared/form-fields'
import { getValueViaPath } from '@island.is/application/core'
import { useFormContext } from 'react-hook-form'
-import { useLazyPlateDetails } from '../../hooks/useLazyPlateDetails'
-import { checkCanRenew } from '../../utils'
interface PlateSearchFieldProps {
myPlateOwnershipList: PlateOwnership[]
@@ -24,7 +21,7 @@ interface PlateSearchFieldProps {
export const PlateSelectField: FC<
React.PropsWithChildren
+
+ )
+}
diff --git a/libs/application/templates/transport-authority/order-vehicle-license-plate/src/fields/VehiclesField/VehicleSelectField.tsx b/libs/application/templates/transport-authority/order-vehicle-license-plate/src/fields/VehiclesField/VehicleSelectField.tsx
index 8a75865a36ba..833cbfac19cf 100644
--- a/libs/application/templates/transport-authority/order-vehicle-license-plate/src/fields/VehiclesField/VehicleSelectField.tsx
+++ b/libs/application/templates/transport-authority/order-vehicle-license-plate/src/fields/VehiclesField/VehicleSelectField.tsx
@@ -1,6 +1,6 @@
import { FieldBaseProps, Option } from '@island.is/application/types'
import { useLocale } from '@island.is/localization'
-import { FC, useCallback, useEffect, useState } from 'react'
+import { FC, useCallback, useState } from 'react'
import {
ActionCard,
AlertMessage,
@@ -27,7 +27,7 @@ interface VehicleSearchFieldProps {
export const VehicleSelectField: FC<
React.PropsWithChildren
+
+ )
+}
diff --git a/libs/application/templates/transport-authority/order-vehicle-registration-certificate/src/fields/VehiclesField/VehicleSelectField.tsx b/libs/application/templates/transport-authority/order-vehicle-registration-certificate/src/fields/VehiclesField/VehicleSelectField.tsx
index 33ca041004fc..d6b832c0a84e 100644
--- a/libs/application/templates/transport-authority/order-vehicle-registration-certificate/src/fields/VehiclesField/VehicleSelectField.tsx
+++ b/libs/application/templates/transport-authority/order-vehicle-registration-certificate/src/fields/VehiclesField/VehicleSelectField.tsx
@@ -1,14 +1,9 @@
import { FieldBaseProps, Option } from '@island.is/application/types'
import { useLocale } from '@island.is/localization'
import { FC, useState } from 'react'
-import {
- ActionCard,
- Box,
- InputError,
- SkeletonLoader,
-} from '@island.is/island-ui/core'
+import { ActionCard, Box, SkeletonLoader } from '@island.is/island-ui/core'
import { VehiclesCurrentVehicle } from '../../shared'
-import { error, information } from '../../lib/messages'
+import { information } from '../../lib/messages'
import { SelectController } from '@island.is/shared/form-fields'
import { useFormContext } from 'react-hook-form'
import { getValueViaPath } from '@island.is/application/core'
@@ -19,7 +14,7 @@ interface VehicleSearchFieldProps {
export const VehicleSelectField: FC<
React.PropsWithChildren-
+ {data.vehicleOwnerChangeValidation.errorMessages.map(
+ (error: OwnerChangeValidationMessage) => {
+ const message = formatMessage(
+ getValueViaPath(
+ applicationCheck.validation,
+ error?.errorNo || '',
+ ),
+ )
+ const defaultMessage = error.defaultMessage
+ const fallbackMessage =
+ formatMessage(
+ applicationCheck.validation.fallbackErrorMessage,
+ ) +
+ ' - ' +
+ error?.errorNo
+
+ return (
+
-
+
+ {message || defaultMessage || fallbackMessage} + +
+ )
+ },
+ )}
+
-
{data.vehicleOwnerChangeValidation.errorMessages.map(
(error: OwnerChangeValidationMessage) => {
const message = formatMessage(
@@ -111,18 +94,20 @@ export const ValidationErrorMessages: FC<
error?.errorNo
return (
-
-
+
+ {message || defaultMessage || fallbackMessage} + +
)
},
)}
-
+
+ )
+}
diff --git a/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/src/fields/VehiclesField/index.tsx b/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/src/fields/VehiclesField/index.tsx
index fb33b27bda13..a3b37a8d45be 100644
--- a/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/src/fields/VehiclesField/index.tsx
+++ b/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/src/fields/VehiclesField/index.tsx
@@ -5,16 +5,14 @@ import {
} from '@island.is/application/types'
import { Box } from '@island.is/island-ui/core'
import { FC, useCallback, useEffect } from 'react'
+import { VehicleRadioField } from './VehicleRadioField'
import { useFormContext } from 'react-hook-form'
import { CurrentVehiclesAndRecords } from '../../shared'
import { ApolloQueryResult, useMutation } from '@apollo/client'
import { UPDATE_APPLICATION } from '@island.is/application/graphql'
import { useLocale } from '@island.is/localization'
import { VehicleSelectField } from './VehicleSelectField'
-import {
- FindVehicleFormField,
- VehicleRadioFormField,
-} from '@island.is/application/ui-fields'
+import { FindVehicleFormField } from '@island.is/application/ui-fields'
import { information, applicationCheck, error } from '../../lib/messages'
import { useLazyVehicleDetails } from '../../hooks/useLazyVehicleDetails'
@@ -94,27 +92,9 @@ export const VehiclesField: FC
-
- )
-}
diff --git a/libs/application/ui-fields/src/lib/index.ts b/libs/application/ui-fields/src/lib/index.ts
index c3e3f9724309..fa43ff03e370 100644
--- a/libs/application/ui-fields/src/lib/index.ts
+++ b/libs/application/ui-fields/src/lib/index.ts
@@ -25,7 +25,6 @@ export { HiddenInputFormField } from './HiddenInputFormField/HiddenInputFormFiel
export { ActionCardListFormField } from './ActionCardListFormField/ActionCardListFormField'
export { TableRepeaterFormField } from './TableRepeaterFormField/TableRepeaterFormField'
export { FindVehicleFormField } from './FindVehicleFormField/FindVehicleFormField'
-export { VehicleRadioFormField } from './VehicleRadioFormField/VehicleRadioFormField'
export { StaticTableFormField } from './StaticTableFormField/StaticTableFormField'
export { AccordionFormField } from './AccordionFormField/AccordionFormField'
export { BankAccountFormField } from './BankAccountFormField/BankAccountFormField'
diff --git a/libs/clients/judicial-system-sp/src/clientConfig.json b/libs/clients/judicial-system-sp/src/clientConfig.json
index 2e4d54e84c54..48c81122e582 100644
--- a/libs/clients/judicial-system-sp/src/clientConfig.json
+++ b/libs/clients/judicial-system-sp/src/clientConfig.json
@@ -450,8 +450,6 @@
"type": "object",
"properties": {
"title": { "type": "string" },
- "subpoenaInfoText": { "type": "string" },
- "subpoenaNotificationDeadline": { "type": "string" },
"subtitle": { "type": "string" },
"groups": {
"type": "array",
@@ -470,8 +468,6 @@
},
"required": [
"title",
- "subpoenaInfoText",
- "subpoenaNotificationDeadline",
"subtitle",
"groups",
"alerts",
diff --git a/libs/clients/transport-authority/vehicle-operators/src/lib/vehicleOperatorsClient.module.ts b/libs/clients/transport-authority/vehicle-operators/src/lib/vehicleOperatorsClient.module.ts
index e382021fb5d5..aaf3401c166d 100644
--- a/libs/clients/transport-authority/vehicle-operators/src/lib/vehicleOperatorsClient.module.ts
+++ b/libs/clients/transport-authority/vehicle-operators/src/lib/vehicleOperatorsClient.module.ts
@@ -1,10 +1,8 @@
import { Module } from '@nestjs/common'
import { VehicleOperatorsClient } from './vehicleOperatorsClient.service'
import { exportedApis } from './apiConfiguration'
-import { VehiclesMileageClientModule } from '@island.is/clients/vehicles-mileage'
@Module({
- imports: [VehiclesMileageClientModule],
providers: [...exportedApis, VehicleOperatorsClient],
exports: [VehicleOperatorsClient],
})
diff --git a/libs/clients/transport-authority/vehicle-operators/src/lib/vehicleOperatorsClient.service.ts b/libs/clients/transport-authority/vehicle-operators/src/lib/vehicleOperatorsClient.service.ts
index 4d2b7d23558d..cb5989c587a5 100644
--- a/libs/clients/transport-authority/vehicle-operators/src/lib/vehicleOperatorsClient.service.ts
+++ b/libs/clients/transport-authority/vehicle-operators/src/lib/vehicleOperatorsClient.service.ts
@@ -1,32 +1,20 @@
import { Auth, AuthMiddleware, User } from '@island.is/auth-nest-tools'
import { Injectable } from '@nestjs/common'
+import { ReturnTypeMessage } from '../../gen/fetch'
import { OperatorApi } from '../../gen/fetch/apis'
import {
Operator,
OperatorChangeValidation,
} from './vehicleOperatorsClient.types'
-import {
- ErrorMessage,
- getCleanErrorMessagesFromTryCatch,
-} from '@island.is/clients/transport-authority/vehicle-owner-change'
-import { MileageReadingApi } from '@island.is/clients/vehicles-mileage'
-import { logger } from '@island.is/logging'
@Injectable()
export class VehicleOperatorsClient {
- constructor(
- private readonly operatorsApi: OperatorApi,
- private readonly mileageReadingApi: MileageReadingApi,
- ) {}
+ constructor(private readonly operatorsApi: OperatorApi) {}
private operatorsApiWithAuth(auth: Auth) {
return this.operatorsApi.withMiddleware(new AuthMiddleware(auth))
}
- private mileageReadingApiWithAuth(auth: Auth) {
- return this.mileageReadingApi.withMiddleware(new AuthMiddleware(auth))
- }
-
public async getOperators(auth: User, permno: string): Promise