Merge remote-tracking branch 'upstream/dev' into release/uat_is92

bcgov · Nov 7, 2024 · 3c9a564 · 3c9a564
2 parents 64acc43 + 573ca86
commit 3c9a564
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 33 deletions.
diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.6.0-92.35</Version>
-    <Version>5.6.0-92.35</Version>
+    <Version>5.6.0-92.36</Version>
+    <Version>5.6.0-92.36</Version>
     <AssemblyVersion>5.6.0.92</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>

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)

diff --git a/source/frontend/package.json b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "5.6.0-92.35",
+  "version": "5.6.0-92.36",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",