PDJB-300: Add invitation lists to property page #1402
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package uk.gov.communities.prsdb.webapp.constants | ||
|
|
||
| const val LOCAL_COUNCIL_INVITATION_LIFETIME_IN_HOURS: Int = 48 | ||
| const val JOINT_LANDLORD_INVITATION_LIFETIME_IN_DAYS: Int = 28 |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,13 @@ import jakarta.persistence.GenerationType | |
| import jakarta.persistence.Id | ||
| import jakarta.persistence.JoinColumn | ||
| import jakarta.persistence.ManyToOne | ||
| import kotlinx.datetime.DatePeriod | ||
| import kotlinx.datetime.plus | ||
| import kotlinx.datetime.toKotlinInstant | ||
| import uk.gov.communities.prsdb.webapp.constants.JOINT_LANDLORD_INVITATION_LIFETIME_IN_DAYS | ||
| import uk.gov.communities.prsdb.webapp.helpers.DateTimeHelper | ||
| import java.time.Instant | ||
| import java.time.temporal.ChronoUnit | ||
| import java.util.UUID | ||
|
|
||
| @Entity | ||
|
|
@@ -33,6 +40,24 @@ class JointLandlordInvitation( | |
| lateinit var invitingLandlord: Landlord | ||
| private set | ||
|
|
||
| val expiryDate: Instant | ||
| get() = createdDate.plus(JOINT_LANDLORD_INVITATION_LIFETIME_IN_DAYS.toLong(), ChronoUnit.DAYS) | ||
|
|
||
| val daysUntilExpiry: Long | ||
| get() = ChronoUnit.DAYS.between(Instant.now(), expiryDate).coerceAtLeast(0) | ||
|
|
||
| val isExpired: Boolean | ||
| get() { | ||
| val dateTimeHelper = DateTimeHelper() | ||
|
|
||
| val expiresOnDate = | ||
| DateTimeHelper | ||
| .getDateInUK(createdDate.toKotlinInstant()) | ||
| .plus(DatePeriod(days = JOINT_LANDLORD_INVITATION_LIFETIME_IN_DAYS)) | ||
|
|
||
| return dateTimeHelper.getCurrentDateInUK() > expiresOnDate | ||
| } | ||
|
|
||
|
Comment on lines
+43
to
+60
Collaborator
There was a problem hiding this comment. I'm just slightly nervous that we have some non-trivial date arithmetic here that all ought to agree. Might be worth some tests for this to check that they all behave as expected, and consistently with each other? Especially at common problem times, like near midnight or near a DST change.
Contributor
Author
There was a problem hiding this comment. see #1401 which I'll rebase in when it's merged, there will be some stringent tests for this |
||
| constructor( | ||
| token: UUID, | ||
| email: String, | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package uk.gov.communities.prsdb.webapp.models.viewModels | ||
|
|
||
| import kotlinx.datetime.toJavaLocalDate | ||
| import kotlinx.datetime.toKotlinInstant | ||
| import uk.gov.communities.prsdb.webapp.database.entity.JointLandlordInvitation | ||
| import uk.gov.communities.prsdb.webapp.helpers.DateTimeHelper | ||
| import java.time.Instant | ||
| import java.time.format.DateTimeFormatter | ||
| import java.util.Locale | ||
|
|
||
| data class PendingInvitationViewModel( | ||
| val email: String, | ||
| val expiresInDays: Long, | ||
| val expiryDate: String, | ||
| val sentDate: String, | ||
| ) | ||
|
|
||
| data class ExpiredInvitationViewModel( | ||
| val email: String, | ||
| val expiredDate: String, | ||
| ) | ||
|
|
||
| class InvitationViewModelBuilder { | ||
| companion object { | ||
| private val DATE_FORMATTER = DateTimeFormatter.ofPattern("d MMMM yyyy", Locale.UK) | ||
|
|
||
| fun buildPendingViewModel(invitation: JointLandlordInvitation): PendingInvitationViewModel = | ||
| PendingInvitationViewModel( | ||
| email = invitation.invitedEmail, | ||
| expiresInDays = invitation.daysUntilExpiry, | ||
| expiryDate = formatInstant(invitation.expiryDate), | ||
| sentDate = formatInstant(invitation.createdDate), | ||
| ) | ||
|
|
||
| fun buildExpiredViewModel(invitation: JointLandlordInvitation): ExpiredInvitationViewModel = | ||
| ExpiredInvitationViewModel( | ||
| email = invitation.invitedEmail, | ||
| expiredDate = formatInstant(invitation.expiryDate), | ||
| ) | ||
|
|
||
| private fun formatInstant(instant: Instant): String = | ||
| DateTimeHelper.getDateInUK(instant.toKotlinInstant()).toJavaLocalDate().format(DATE_FORMATTER) | ||
| } | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| @import "govuk/base"; | ||
|
|
||
| .prsdb-link-group-list { | ||
| list-style: none; | ||
| padding: 0; | ||
| margin: 0; | ||
| display: flex; | ||
|
|
||
| .prsdb-link-group-item:first-child { | ||
| padding: 0; | ||
| margin: 0; | ||
| } | ||
|
|
||
| .prsdb-link-group-item:not(:first-child) { | ||
| margin-left: govuk-spacing(2); | ||
| padding-left: govuk-spacing(2); | ||
| border-left: 1px solid govuk-colour("mid-grey"); | ||
| } | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| @use "dashboard"; | ||
| @use "deregisterLinks"; | ||
| @use "linkGroupList"; |
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this may change - right now assuming that LCs won't be able to view pending/expired invites though design to input on what should happen here