Updated repository to only retrieve the necessary information for a r…

…eport (#4457)
bcgov · Nov 7, 2024 · 708dc61 · 708dc61
1 parent 681193a
commit 708dc61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/source/backend/dal/Repositories/LeasePaymentRepository.cs b/source/backend/dal/Repositories/LeasePaymentRepository.cs
@@ -47,40 +47,10 @@ public IEnumerable<PimsLeasePayment> GetAllTracking(DateTime startDate, DateTime
             return this.Context.PimsLeasePayments
                 .AsSplitQuery()
                 .Include(p => p.LeasePaymentCategoryTypeCodeNavigation)
-                .Include(p => p.LeasePeriod)
-                    .ThenInclude(t => t.Lease)
-                    .ThenInclude(p => p.PimsPropertyLeases)
-                    .ThenInclude(p => p.Property)
-                    .ThenInclude(p => p.PimsHistoricalFileNumbers)
-                    .ThenInclude(h => h.HistoricalFileNumberTypeCodeNavigation)
-                .Include(p => p.LeasePeriod)
-                    .ThenInclude(t => t.Lease)
-                    .ThenInclude(p => p.RegionCodeNavigation)
-                .Include(p => p.LeasePeriod)
-                    .ThenInclude(t => t.Lease)
-                    .ThenInclude(t => t.LeaseStatusTypeCodeNavigation)
-                .Include(p => p.LeasePeriod)
-                    .ThenInclude(t => t.Lease)
-                    .ThenInclude(t => t.LeasePayRvblTypeCodeNavigation)
-                .Include(p => p.LeasePeriod)
-                    .ThenInclude(t => t.Lease)
-                    .ThenInclude(t => t.PimsLeaseStakeholders)
-                    .ThenInclude(t => t.Person)
-                .Include(p => p.LeasePeriod)
-                    .ThenInclude(t => t.Lease)
-                    .ThenInclude(t => t.LeaseProgramTypeCodeNavigation)
-                .Include(p => p.LeasePeriod)
-                    .ThenInclude(t => t.Lease)
-                    .ThenInclude(p => p.PimsLeaseLeasePurposes)
-                    .ThenInclude(c => c.LeasePurposeTypeCodeNavigation)
                 .Include(p => p.LeasePeriod)
                     .ThenInclude(t => t.LeasePeriodStatusTypeCodeNavigation)
                 .Include(p => p.LeasePeriod)
                     .ThenInclude(t => t.LeasePmtFreqTypeCodeNavigation)
-                .Include(p => p.LeasePeriod)
-                    .ThenInclude(t => t.Lease)
-                    .ThenInclude(t => t.PimsLeasePeriods)
-                    .ThenInclude(t => t.PimsLeasePayments)
                 .Where(p => p.PaymentReceivedDate <= endDate && p.PaymentReceivedDate >= startDate);
         }
     }

diff --git a/source/backend/dal/Repositories/LeaseRepository.cs b/source/backend/dal/Repositories/LeaseRepository.cs
@@ -121,6 +121,9 @@ public IEnumerable<PimsLease> GetAllByIds(IEnumerable<long> leaseIds)
 
             IEnumerable<PimsLease> leases = this.Context.PimsLeases.AsSplitQuery().AsNoTracking()
                 .Include(l => l.PimsPropertyLeases)
+                    .ThenInclude(p => p.Property)
+                    .ThenInclude(p => p.PimsHistoricalFileNumbers)
+                    .ThenInclude(h => h.HistoricalFileNumberTypeCodeNavigation)
                 .Include(l => l.RegionCodeNavigation)
                 .Include(l => l.LeaseProgramTypeCodeNavigation)
                 .Include(l => l.LeasePayRvblTypeCodeNavigation)
@@ -131,6 +134,7 @@ public IEnumerable<PimsLease> GetAllByIds(IEnumerable<long> leaseIds)
                     .ThenInclude(p => p.LeasePurposeTypeCodeNavigation)
                 .Include(l => l.LeaseStatusTypeCodeNavigation)
                 .Include(l => l.PimsLeaseStakeholders)
+                    .ThenInclude(t => t.Person)
                 .Include(t => t.PimsPropertyImprovements)
                 .Include(l => l.PimsInsurances)
                 .Include(l => l.PimsSecurityDeposits)