fix: auto-expire lease updates property status, clears renewal, filters dashboard widget

Author: CIS Guru

2-Nine.Application/Services/LeaseService.cs

@@ -502,6 +502,7 @@ public async Task<Lease> UpdateLeaseStatusAsync(Guid leaseId, string newStatus)
                         if (!hasOtherActiveLeases)
                         {
                             property.IsActive = true;
+                            property.Status = ApplicationConstants.PropertyStatuses.Available;
                         }
                     }
 

2-Nine.Application/Services/Workflows/LeaseWorkflowService.cs

@@ -607,9 +607,29 @@ public async Task<WorkflowResult<int>> ExpireOverdueLeaseAsync(Guid organization
                 {
                     var oldStatus = lease.Status;
                     lease.Status = ApplicationConstants.LeaseStatuses.Expired;
+                    lease.RenewalStatus = "Expired";
                     lease.LastModifiedBy = userId;
                     lease.LastModifiedOn = DateTime.UtcNow;
 
+                    // Update property status if no other active leases exist for it
+                    if (lease.Property != null)
+                    {
+                        var hasOtherActiveLeases = await _context.Leases
+                            .AnyAsync(l => l.PropertyId == lease.PropertyId
+                                && l.Id != lease.Id
+                                && !l.IsDeleted
+                                && (l.Status == ApplicationConstants.LeaseStatuses.Active
+                                    || l.Status == ApplicationConstants.LeaseStatuses.Pending));
+
+                        if (!hasOtherActiveLeases)
+                        {
+                            lease.Property.Status = ApplicationConstants.PropertyStatuses.Available;
+                            lease.Property.IsActive = true;
+                            lease.Property.LastModifiedBy = userId;
+                            lease.Property.LastModifiedOn = DateTime.UtcNow;
+                        }
+                    }
+
                     await LogTransitionAsync(
                         "Lease",
                         lease.Id,

3-Nine.Shared.UI/Components/Entities/Leases/LeaseRenewalList.razor

@@ -135,15 +135,24 @@
             var today = DateTime.Today;
 
             leases30Days = Leases
-                .Where(l => l.EndDate <= today.AddDays(30))
+                .Where(l => l.Status != "Expired"
+                         && l.Status != "Terminated"
+                         && l.EndDate >= today
+                         && l.EndDate <= today.AddDays(30))
                 .ToList();
 
             leases60Days = Leases
-                .Where(l => l.EndDate <= today.AddDays(60))
+                .Where(l => l.Status != "Expired"
+                         && l.Status != "Terminated"
+                         && l.EndDate >= today
+                         && l.EndDate <= today.AddDays(60))
                 .ToList();
 
             leases90Days = Leases
-                .Where(l => l.EndDate <= today.AddDays(90))
+                .Where(l => l.Status != "Expired"
+                         && l.Status != "Terminated"
+                         && l.EndDate >= today
+                         && l.EndDate <= today.AddDays(90))
                 .ToList();
         }
         catch (Exception ex)