PDJB-300: Add invitation lists to property page by samyou-softwire · Pull Request #1402 · communitiesuk/prsdb-webapp

samyou-softwire · 2026-06-03T10:16:58Z

Ticket number

PDJB-300

Goal of change

adds lists of pending & expired invitations to the property details page

property details landlord tab with invitations

Description of main change(s)

adds logic to the property tab to show the invitations

adds database model to get invitations of a certain type

adds some useful methods to invitation entity

adds tests

Anything you'd like to highlight to the reviewer?

see comments

Checklist

Delete any that are not applicable, and add explanation below for any that are applicable but haven't been done

Screenshots of any UI changes have been added
Unit tests for new logic (e.g. new service methods) have been added
Controller tests for any new endpoints, including testing the relevant permissions
Single page integration tests have been added for any unhappy-flow UI features, e.g. validation errors
Test suite has been run in full locally and is passing
Branch has been rebased onto main and run locally, with everything working as expected (both for your new feature
and any related functionality)
TODO comments referencing this JIRA ticket have been searched for and removed - if a future PR will address them,
mention that here
QA instructions have been added to the ticket (particularly if this is the last PR required to complete the ticket)

samyou-softwire · 2026-06-03T10:26:12Z

        model.addAttribute("complianceDetails", propertyComplianceDetails)
        model.addAttribute("complianceInfoTabId", COMPLIANCE_INFO_FRAGMENT)
        model.addAttribute("isLandlordView", false)
+        model.addAttribute("isJointLandlordsEnabled", false)


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

samyou-softwire · 2026-06-03T11:28:17Z

+                                           th:text="#{propertyDetails.landlordDetails.invitations.pendingInvitations.sentOn(${invitation.sentDate})}">
+                                            Sent on 18 October 2025
+                                        </p>
+                                        <ul class="govuk-summary-list__actions-list">


I'm suspicious of this - this is the simplest class that would give us the divider between actions but it's not a great use of GDS components. fine to keep as is or should we add our own copy of the relevant CSS?

https://design-system.service.gov.uk/components/summary-list/

Yeah, this feels unsafe to me. It might work now, but who knows what it'll be like when govuk-frontend updates another version or two. Owning our own copy has its own risks (we'll have to come and check this again for compatibility when we upgrade), but that feels a bit more explicit, at least.

samyou-softwire · 2026-06-03T12:45:20Z

        invitingLandlord = MockLandlordData.createLandlord()
    }

-    @Test


the diff is weird here since the existing tests are now wrapped in a class

rowanhill · 2026-06-04T11:19:25Z

+            val pendingInvitations =
+                jointLandlordInvitationService
+                    .getPendingInvitations(propertyOwnership)
+                    .map { InvitationViewModelBuilder.buildPendingViewModel(it) }
+            val expiredInvitations =
+                jointLandlordInvitationService
+                    .getExpiredInvitations(propertyOwnership)
+                    .map { InvitationViewModelBuilder.buildExpiredViewModel(it) }


This is going to mean two identical queries to the database, and a tiny race condition between them. I think it might be better for the service to have a single getPendingAndExpiredInvitations() that ultimately does a single queries and then partitions in memory.

It's a tiny issue, but also hopefully not hard to fix?

good point, have changed this to partition

rowanhill · 2026-06-04T11:24:56Z

+  invitations:
+    pendingInvitations:
+      heading: 'Pending invitations ({0})'
+      expiresIn: 'Expires in {0} days ({1})'


Do we need to worry about "1 days" and "0 days"?

suspect we do, have added alternate copy for this

I don't think any of these other strings need a singular equivalent

rowanhill · 2026-06-04T11:35:00Z

+                                           th:text="#{propertyDetails.landlordDetails.invitations.pendingInvitations.sentOn(${invitation.sentDate})}">
+                                            Sent on 18 October 2025
+                                        </p>
+                                        <ul class="govuk-summary-list__actions-list">


Yeah, this feels unsafe to me. It might work now, but who knows what it'll be like when govuk-frontend updates another version or two. Owning our own copy has its own risks (we'll have to come and check this again for compatibility when we upgrade), but that feels a bit more explicit, at least.

rowanhill · 2026-06-04T11:41:43Z

+    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
+        }
+


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.

see #1401 which I'll rebase in when it's merged, there will be some stringent tests for this

this means we only query the database once avoiding a potential race condition

samyou-softwire self-assigned this Jun 3, 2026

samyou-softwire force-pushed the feat/PDJB-300-property-record-landlord-invite-details branch from a222ca6 to cb0fc58 Compare June 3, 2026 10:23

samyou-softwire commented Jun 3, 2026

View reviewed changes

samyou-softwire force-pushed the feat/PDJB-300-property-record-landlord-invite-details branch from 9d349fa to 3f74d30 Compare June 3, 2026 12:34

samyou-softwire added 4 commits June 3, 2026 13:41

PDJB-300: Add structure to get invitation details

f32b887

PDJB-300: Add invitations to frontend

3d72102

PDJB-300: Add unit tests

e878a50

PDJB-300: Add integration test

856ec34

samyou-softwire force-pushed the feat/PDJB-300-property-record-landlord-invite-details branch from 3f74d30 to 856ec34 Compare June 3, 2026 12:43

samyou-softwire commented Jun 3, 2026

View reviewed changes

samyou-softwire marked this pull request as ready for review June 3, 2026 12:48

rowanhill reviewed Jun 4, 2026

View reviewed changes

TomHanmer29 mentioned this pull request Jun 4, 2026

PDJB-NONE: add isExpired accessor for JL invitation #1401

Merged

samyou-softwire added 3 commits June 4, 2026 15:23

PDJB-300: Use a partition on the invite database query

b5f3f46

this means we only query the database once avoiding a potential race condition

PDJB-300: Add singular expires on option

d3777f9

PDJB-300: Implement custom css for link groups

16e86a9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PDJB-300: Add invitation lists to property page#1402

PDJB-300: Add invitation lists to property page#1402
samyou-softwire wants to merge 7 commits into
mainfrom
feat/PDJB-300-property-record-landlord-invite-details

samyou-softwire commented Jun 3, 2026 •

edited

Loading

Uh oh!

samyou-softwire Jun 3, 2026

Uh oh!

samyou-softwire Jun 3, 2026

Uh oh!

samyou-softwire Jun 3, 2026

Uh oh!

rowanhill Jun 4, 2026

Uh oh!

samyou-softwire Jun 3, 2026

Uh oh!

rowanhill Jun 4, 2026

Uh oh!

samyou-softwire Jun 4, 2026

Uh oh!

rowanhill Jun 4, 2026

Uh oh!

samyou-softwire Jun 4, 2026

Uh oh!

rowanhill Jun 4, 2026

Uh oh!

rowanhill Jun 4, 2026

Uh oh!

samyou-softwire Jun 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

samyou-softwire commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ticket number

Goal of change

Description of main change(s)

Anything you'd like to highlight to the reviewer?

Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

samyou-softwire commented Jun 3, 2026 •

edited

Loading