Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(j-s): Merge Email #16011

Merged
merged 4 commits into from
Sep 16, 2024
Merged

fix(j-s): Merge Email #16011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
907fb2c
Fixes conclusion in merge email
gudjong Sep 13, 2024
b88ea85
Updates unit test
gudjong Sep 13, 2024
a35f064
Merge branch 'main' into j-s/fix-merge-email
kodiakhq[bot] Sep 16, 2024
de896ea
Merge branch 'main' into j-s/fix-merge-email
kodiakhq[bot] Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .../modules/notification/test/internalNotificationController/sendRulingNotifications.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
} from '@island.is/judicial-system/consts'
import {
CaseDecision,
CaseIndictmentRulingDecision,
CaseState,
CaseType,
NotificationType,
Expand Down Expand Up @@ -87,6 +88,7 @@ describe('InternalNotificationController - Send ruling notifications', () => {
type: CaseType.INDICTMENT,
courtCaseNumber: '007-2022-07',
court: { name: 'Héraðsdómur Reykjavíkur' },
indictmentRulingDecision: CaseIndictmentRulingDecision.MERGE,
prosecutor,
} as Case

Expand All @@ -101,7 +103,7 @@ describe('InternalNotificationController - Send ruling notifications', () => {
expect.objectContaining({
to: [{ name: prosecutor.name, address: prosecutor.email }],
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ðgengileg á ${expectedLink}yfirlitssíðu málsins í Réttarvörslugátt</a>.`,
html: `Máli 007-2022-07 hjá Héraðsdómi Reykjavíkur hefur verið lokið.<br /><br />Niðurstaða: Sameinað<br /><br />Skjöl málsins eru aðgengileg á ${expectedLink}yfirlitssíðu málsins í Réttarvörslugátt</a>.`,
}),
)
})
Expand Down
2 changes: 2 additions & 0 deletions libs/judicial-system/formatters/src/lib/formatters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ export const getHumanReadableCaseIndictmentRulingDecision = (
return 'Frávísun'
case CaseIndictmentRulingDecision.CANCELLATION:
return 'Niðurfelling máls'
case CaseIndictmentRulingDecision.MERGE:
return 'Sameinað'
default:
return 'Ekki skráð'
}
Expand Down
Loading