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

updated email system to use better username display #1077

Merged
merged 4 commits into from
Feb 14, 2024
Merged

updated email system to use better username display #1077

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
27d2cf6
updated email system to use better username display
ARADDCC002 Feb 9, 2024
460a070
changed the fallback email display name to be original createdBy value
ARADDCC002 Feb 9, 2024
962e877
updated more email names
ARADDCC002 Feb 9, 2024
8c3c01e
updated email test
ARADDCC002 Feb 9, 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
21 changes: 17 additions & 4 deletions backend/src/services/v2/smtp/smtp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ export async function requestReviewForRelease(entity: string, review: ReviewDoc,
{ title: 'Model ID', data: release.modelId },
{ title: 'Your Role', data: review.role.toUpperCase() },
{ title: 'Semver', data: release.semver },
{ title: 'Created By', data: release.createdBy },
{
title: 'Created By',
data: (await authentication.getUserInformation(toEntity('user', release.createdBy))).name || release.createdBy,
},
],
[
{ name: 'Open Release', url: 'TODO' },
Expand All @@ -68,7 +71,12 @@ export async function requestReviewForAccessRequest(
{ title: 'Model ID', data: accessRequest.modelId },
{ title: 'Your Role', data: review.role.toUpperCase() },
{ title: 'Entities Requesting Access', data: accessRequest.metadata.overview.entities.toString() },
{ title: 'Created By', data: accessRequest.createdBy },
{
title: 'Created By',
data:
(await authentication.getUserInformation(toEntity('user', accessRequest.createdBy))).name ||
accessRequest.createdBy,
},
],
[
{ name: 'Open Access Request', url: 'TODO' },
Expand All @@ -90,8 +98,11 @@ export async function notifyReviewResponseForRelease(review: ReviewDoc, release:
log.info('response not found')
return
}

const emailContent = buildEmail(
`Release ${release.semver} has been reviewed by ${reviewResponse?.user}`,
`Release ${release.semver} has been reviewed by ${
(await authentication.getUserInformation(toEntity('user', reviewResponse?.user))).name || reviewResponse?.user
}`,
[
{ title: 'Model ID', data: release.modelId },
{ title: 'Reviewer Role', data: review.role.toUpperCase() },
Expand All @@ -117,7 +128,9 @@ export async function notifyReviewResponseForAccess(review: ReviewDoc, accessReq
return
}
const emailContent = buildEmail(
`Access request for model ${accessRequest.modelId} has been reviewed by ${reviewResponse.user}`,
`Access request for model ${accessRequest.modelId} has been reviewed by ${
(await authentication.getUserInformation(toEntity('user', reviewResponse?.user))).name || reviewResponse?.user
}`,
[
{ title: 'Model ID', data: accessRequest.modelId },
{ title: 'Reviewer Role', data: review.role.toUpperCase() },
Expand Down
2 changes: 2 additions & 0 deletions backend/test/services/smtp/smtp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ vi.mock('nodemailer', async () => ({

const authenticationMock = vi.hoisted(() => ({
getUserInformationList: vi.fn(() => [Promise.resolve({ email: '[email protected]' })]),
getUserInformation: vi.fn(() => [Promise.resolve({ name: 'Joe Blogs' })]),
}))
vi.mock('../../../src/connectors/v2/authentication/index.js', async () => ({ default: authenticationMock }))

Expand Down Expand Up @@ -123,6 +124,7 @@ describe('services > smtp > smtp', () => {

test('that an email is sent for Access Request Reviews', async () => {
await requestReviewForAccessRequest('user:user', review, access)
authenticationMock.getUserInformation.mockReturnValueOnce([Promise.resolve({ name: 'Joe Blogs' })])

expect(transporterMock.sendMail.mock.calls.at(0)).toMatchSnapshot()
})
Expand Down
Loading