psp-8771 & psp-8683 | Lease expiry using renewal information #4189
Conversation
…y definition for leases
|
✅ No secrets were detected in the code. |
|
✅ No secrets were detected in the code. |
| { | ||
| dest.LFileNo = src.lease.LFileNo; | ||
| dest.MotiRegion = src.lease.RegionCodeNavigation?.RegionName; | ||
| dest.StartDate = src.lease.OrigStartDate.FilterSqlMinDate().ToNullableDateOnly(); | ||
| dest.EndDate = src.lease.OrigExpiryDate?.FilterSqlMinDate().ToNullableDateOnly(); | ||
| dest.EndDate = src.expiryDate.ToNullableDateOnly(); |
There was a problem hiding this comment.
Do we need to filter the sql min date here? previously this would cause exceptions converting from an sql min date to a date time.
| @@ -36,7 +36,7 @@ private static void MapLease((Entity.PimsLeasePeriod period, Entity.PimsLease le | |||
| dest.InspectionNotes = src.lease.InspectionNotes; | |||
| dest.InspectionDate = src.lease.InspectionDate?.FilterSqlMinDate(); | |||
| dest.LeaseNotes = src.lease.LeaseNotes; | |||
| dest.IsExpired = (src.lease.GetExpiryDate() < DateTime.Now).BoolToYesNo(); | |||
| dest.IsExpired = (src.expiryDate < DateTime.Now).BoolToYesNo(); | |||
There was a problem hiding this comment.
Do we need to include renewals in this calculation?
There was a problem hiding this comment.
Not 100%. I dont think this field is actually used in the frontend. But I will clean it up as tech debt
| const excercisedRenewalDates = renewals.filter(r => r.isExercised).flatMap(fr => fr.expiryDt); | ||
|
|
||
| let calculatedExpiry: string | null = lease?.expiryDate ?? ''; | ||
| for (let i = 0; i < excercisedRenewalDates.length; i++) { |
There was a problem hiding this comment.
could also do with a sort? this seems fine though.
|
@FuriousLlama here is the only area I'm seeing a mismatch so far: |
|
✅ No secrets were detected in the code. |
Updated lease expiry search to use renewal information. Updated expiry definition for leases