From 6475692db156740d4a68de9f26b0f982bcc88f5d Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Tue, 23 Jan 2024 15:56:23 +0000 Subject: [PATCH] Consider accommodation for trip end date --- agenda/types.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/agenda/types.py b/agenda/types.py index 4bcfa5b..a96eff3 100644 --- a/agenda/types.py +++ b/agenda/types.py @@ -56,7 +56,14 @@ class Trip: travel_end = max(arrive) if arrive else datetime.date.min assert isinstance(travel_end, datetime.date) - max_date = max(max_conference_end, travel_end) + accommodation_end = ( + max(as_date(item["to"]) for item in self.accommodation) + if self.accommodation + else datetime.date.min + ) + assert isinstance(accommodation_end, datetime.date) + + max_date = max(max_conference_end, travel_end, accommodation_end) return max_date if max_date != datetime.date.min else None @property