Psp 3042 (#1110)

* remove lease notes specific repository behaviour. Changing the response navigations was causing failures in some cases. * test corrections. * increment patch number Co-authored-by: Smith <[email protected]>
bcgov · Mar 16, 2022 · 4dea2bc · 4dea2bc
1 parent 13d17c8
commit 4dea2bc
Show file tree

Hide file tree

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

diff --git a/backend/dal/Repositories/Interfaces/ILeaseRepository.cs b/backend/dal/Repositories/Interfaces/ILeaseRepository.cs
@@ -12,7 +12,7 @@ public interface ILeaseRepository : IRepository<PimsLease>
         int Count();
         IEnumerable<PimsLease> Get(LeaseFilter filter, bool loadPayments = false);
         long GetRowVersion(long id);
-        PimsLease Get(long id, bool skipNavigations = false);
+        PimsLease Get(long id);
         Paged<PimsLease> GetPage(LeaseFilter filter);
         PimsLease Add(PimsLease lease, bool userOverride = false);
         PimsLease Update(PimsLease lease, bool commitTransaction = true);

diff --git a/backend/dal/Repositories/LeaseRepository.cs b/backend/dal/Repositories/LeaseRepository.cs
@@ -64,14 +64,12 @@ public long GetRowVersion(long id)
             this.User.ThrowIfNotAuthorized(Permissions.LeaseView);
             return this.Context.PimsLeases.Where(l => l.LeaseId == id)?.Select(l => l.ConcurrencyControlNumber)?.FirstOrDefault() ?? throw new KeyNotFoundException();
         }
-        public PimsLease Get(long id, bool skipNavigations = false)
+        public PimsLease Get(long id)
         {
             this.User.ThrowIfNotAuthorized(Permissions.LeaseView);
 
-            IQueryable<PimsLease> leaseQuery = this.Context.PimsLeases.Where(l => l.LeaseId == id);
-            if (!skipNavigations)
-            {
-                leaseQuery = leaseQuery.Include(l => l.PimsPropertyLeases)
+            PimsLease lease = this.Context.PimsLeases
+                .Include(l => l.PimsPropertyLeases)
                 .ThenInclude(p => p.Property)
                     .ThenInclude(p => p.Address)
                     .ThenInclude(p => p.Country)
@@ -151,9 +149,8 @@ public PimsLease Get(long id, bool skipNavigations = false)
                     .ThenInclude(t => t.LeasePaymentMethodTypeCodeNavigation)
                 .Include(t => t.PimsLeaseTerms)
                     .ThenInclude(t => t.PimsLeasePayments)
-                    .ThenInclude(t => t.LeasePaymentStatusTypeCodeNavigation);
-            }
-            PimsLease lease = leaseQuery.FirstOrDefault() ?? throw new KeyNotFoundException();
+                    .ThenInclude(t => t.LeasePaymentStatusTypeCodeNavigation)
+                .FirstOrDefault(l=>l.LeaseId == id) ?? throw new KeyNotFoundException();
 
             lease.LeasePurposeTypeCodeNavigation = this.Context.PimsLeasePurposeTypes.Single(type => type.LeasePurposeTypeCode == lease.LeasePurposeTypeCode);
             lease.PimsPropertyImprovements = lease.PimsPropertyImprovements.OrderBy(i => i.PropertyImprovementTypeCode).ToArray();

diff --git a/backend/dal/Services/SecurityDepositService.cs b/backend/dal/Services/SecurityDepositService.cs
@@ -55,10 +55,11 @@ public PimsLease UpdateLeaseDepositNote(long leaseId, long leaseRowVersion, stri
         {
             _user.ThrowIfNotAuthorized(Permissions.LeaseEdit);
             ValidateServiceCall(leaseId, leaseRowVersion);
-            var lease = _leaseRepository.Get(leaseId, true);
+            var lease = _leaseRepository.Get(leaseId);
             lease.ReturnNotes = note;
             _leaseRepository.Update(lease);
             _leaseRepository.CommitTransaction();
+
             return _leaseRepository.Get(leaseId);
         }
 

diff --git a/backend/tests/unit/api/Controllers/Leases/LeaseControllerTest.cs b/backend/tests/unit/api/Controllers/Leases/LeaseControllerTest.cs
@@ -36,7 +36,7 @@ public void GetLeases_All_Success()
             var service = helper.GetService<Mock<IPimsRepository>>();
             var mapper = helper.GetService<IMapper>();
 
-            service.Setup(m => m.Lease.Get(It.IsAny<long>(), false)).Returns(lease);
+            service.Setup(m => m.Lease.Get(It.IsAny<long>())).Returns(lease);
 
             // Act
             var result = controller.GetLease(1);
@@ -46,7 +46,7 @@ public void GetLeases_All_Success()
             var actualResult = Assert.IsType<Model.LeaseModel>(actionResult.Value);
             var expectedResult = mapper.Map<Model.LeaseModel>(lease);
             Assert.Equal(expectedResult, actualResult, new DeepPropertyCompare());
-            service.Verify(m => m.Lease.Get(It.IsAny<long>(), false), Times.Once());
+            service.Verify(m => m.Lease.Get(It.IsAny<long>()), Times.Once());
         }
         #endregion
         #region UpdateProperties

diff --git a/backend/tests/unit/dal/Services/LeaseTermServiceTest.cs b/backend/tests/unit/dal/Services/LeaseTermServiceTest.cs
@@ -38,7 +38,7 @@ public void AddTerm()
             var leaseRepository = helper.GetService<Mock<Repositories.ILeaseRepository>>();
             var leaseTermRepository = helper.GetService<Mock<Repositories.ILeaseTermRepository>>();
             leaseService.Setup(x => x.IsRowVersionEqual(It.IsAny<long>(), It.IsAny<long>())).Returns(true);
-            leaseRepository.Setup(x => x.Get(It.IsAny<long>(), false)).Returns(lease);
+            leaseRepository.Setup(x => x.Get(It.IsAny<long>())).Returns(lease);
 
             // Act
             var term = new PimsLeaseTerm() { TermStartDate = DateTime.Now, LeaseId = lease.Id, Lease = lease };
@@ -47,7 +47,7 @@ public void AddTerm()
 
             // Assert
             leaseTermRepository.Verify(x => x.Add(term), Times.Once);
-            leaseRepository.Verify(x => x.Get(lease.Id, false), Times.Once);
+            leaseRepository.Verify(x => x.Get(lease.Id), Times.Once);
         }
 
         [Fact]
@@ -204,7 +204,7 @@ public void UpdateTerm()
             var leaseService = helper.GetService<Mock<ILeaseService>>();
             var leaseRepository = helper.GetService<Mock<Repositories.ILeaseRepository>>();
             leaseService.Setup(x => x.IsRowVersionEqual(It.IsAny<long>(), It.IsAny<long>())).Returns(true);
-            leaseRepository.Setup(x => x.Get(It.IsAny<long>(), false)).Returns(lease);
+            leaseRepository.Setup(x => x.Get(It.IsAny<long>())).Returns(lease);
             var leaseTermRepository = helper.GetService<Mock<Repositories.ILeaseTermRepository>>();
             leaseTermRepository.Setup(x => x.GetById(It.IsAny<long>(), It.IsAny<bool>())).Returns(originalTerm);
 
@@ -215,7 +215,7 @@ public void UpdateTerm()
 
             // Assert
             leaseTermRepository.Verify(x => x.Update(term), Times.Once);
-            leaseRepository.Verify(x => x.Get(lease.Id, false), Times.Once);
+            leaseRepository.Verify(x => x.Get(lease.Id), Times.Once);
         }
 
         [Fact]
@@ -324,7 +324,7 @@ public void DeleteTerm()
             var leaseService = helper.GetService<Mock<ILeaseService>>();
             var leaseRepository = helper.GetService<Mock<Repositories.ILeaseRepository>>();
             leaseService.Setup(x => x.IsRowVersionEqual(It.IsAny<long>(), It.IsAny<long>())).Returns(true);
-            leaseRepository.Setup(x => x.Get(It.IsAny<long>(), false)).Returns(lease);
+            leaseRepository.Setup(x => x.Get(It.IsAny<long>())).Returns(lease);
             var leaseTermRepository = helper.GetService<Mock<Repositories.ILeaseTermRepository>>();
             leaseTermRepository.Setup(x => x.GetById(It.IsAny<long>(), It.IsAny<bool>())).Returns(originalTerm);
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.1.3-21.45",
+  "version": "1.1.4-21.45",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",