DP-785 - User Management - Resend Invite #884
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…te if all invites are expired.
rmohammed-goaco
changed the title
rmohammed-goaco
requested review from
dpatel017,
andymantell,
maciej-goaco,
jakzal,
dharmverma,
JBaigGoaco and
shilpigoel-goaco
and removed request for
dpatel017
andymantell
requested changes
Nov 4, 2024
....OrganisationInformation.Persistence/Migrations/20241030163144_AddExpiresOnToPersonInvite.cs
Show resolved
Hide resolved
maciej-goaco
reviewed
Nov 4, 2024
| private void GuardPersonInviteAleadyClaimed(PersonInvite personInvite) | ||
| private void GuardPersonInviteExpired(PersonInvite personInvite) | ||
| { | ||
| if (personInvite.ExpiresOn < DateTimeOffset.UtcNow) |
There was a problem hiding this comment.
i think we'd need to use UtcDateTime of ExpiresOn in this comparison to make sure we're comparing UTC times here, e.g. if (personInvite.ExpiresOn?.UtcDateTime < DateTimeOffset.UtcNow)
There was a problem hiding this comment.
Yeah. Thats much better. I've applied this change.
…ce/GCGS-Central-Digital-Platform into feature/DP-785-resend-invite
maciej-goaco
approved these changes
Nov 4, 2024
andymantell
approved these changes
Nov 4, 2024
dpatel017
approved these changes
Nov 4, 2024
jakzal
requested changes
Nov 5, 2024
Services/CO.CDP.Organisation.WebApi/UseCase/InvitePersonToOrganisationUseCase.cs
Show resolved
Hide resolved
jakzal
reviewed
Nov 6, 2024
| _personsInviteRepository.Verify(repo => repo.Save(It.IsAny<PersonInvite>()), Times.Once); | ||
| _mockGovUKNotifyApiClient.Verify(client => client.SendEmail(It.IsAny<EmailNotificationRequest>()), Times.Once); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async Task Execute_ValidInviteDuplicateEmailForOrganisation_ThrowsException() | ||
| public async Task Execute_ValidInviteWithSameEmailForOrganisation_ExpiresExistingInviteAndCreatesAnother() |
There was a problem hiding this comment.
something went wrong with indentation here.
jakzal
approved these changes
Nov 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes a migration to add
ExpiredOnso looks bigger than it actually is.Adds functionality to allow the user to "Resend" an invite. A new
ExpiredOnfield has been added. This is used to expire any other unexpired person invites and create a new one. Once a person invite has expired it can no longer be claimed.The functionality has been implemented in a way that will allow us to extend it to expire a person invite after a specific time. It also takes into account that this may happen automatically in a future update (using scheduled events of some kind). At the moment the functionality is manual where an organisation admin can click a button to confirm the person invite details and send out a new one.
The person invite list has also been updated to only display the unexpired person invite, if one exists, but otherwise the last person invite that expired; so that it can resent if needs be.
https://noticingsystem.atlassian.net/browse/DP-785