From 8228044880dcfd4b751c33f744bb297206bb2e67 Mon Sep 17 00:00:00 2001
From: Herrera <eduardo.herrera@quartech.com>
Date: Sun, 24 Mar 2024 18:48:42 -0700
Subject: [PATCH 1/3] PSP-8051 : FT:User is able to add the retired property
 record to the Acquisition&lease/license files

---
 .../api/Services/AcquisitionFileService.cs    |  12 +-
 .../api/Services/DispositionFileService.cs    |  16 ++-
 source/backend/api/Services/LeaseService.cs   |  26 +++--
 .../DispositionFilePropertyModel.cs           |   2 -
 .../Repositories/AcquisitionFileRepository.cs |   2 +-
 .../Repositories/DispositionFileRepository.cs |   2 +-
 .../Interfaces/IPropertyRepository.cs         |   2 +-
 .../dal/Repositories/LeaseRepository.cs       |   2 +-
 .../dal/Repositories/PropertyRepository.cs    |  65 ++++++-----
 .../Services/AcquisitionFileServiceTest.cs    | 107 ++++++++++++++++--
 .../Services/DispositionFileServiceTest.cs    |  95 ++++++++++++++--
 .../unit/api/Services/LeaseServiceTest.cs     |  67 ++++++++---
 .../api/Services/ResearchFileServiceTest.cs   |   4 +-
 .../DispositionFileRepositoryTest.cs          |   2 +-
 .../dal/Repositories/LeaseRepositoryTest.cs   |   6 +-
 15 files changed, 321 insertions(+), 89 deletions(-)

diff --git a/source/backend/api/Services/AcquisitionFileService.cs b/source/backend/api/Services/AcquisitionFileService.cs
index 6108f41013..61b06767e7 100644
--- a/source/backend/api/Services/AcquisitionFileService.cs
+++ b/source/backend/api/Services/AcquisitionFileService.cs
@@ -626,7 +626,12 @@ private void MatchProperties(PimsAcquisitionFile acquisitionFile, IEnumerable<Us
                     var pid = acquisitionProperty.Property.Pid.Value;
                     try
                     {
-                        var foundProperty = _propertyRepository.GetByPid(pid);
+                        var foundProperty = _propertyRepository.GetByPid(pid, true);
+                        if (foundProperty.IsRetired.HasValue && foundProperty.IsRetired.Value)
+                        {
+                            throw new BusinessRuleViolationException("Retired property can not be selected.");
+                        }
+
                         acquisitionProperty.PropertyId = foundProperty.Internal_Id;
                         _propertyService.UpdateLocation(acquisitionProperty.Property, ref foundProperty, userOverrideCodes);
                         acquisitionProperty.Property = foundProperty;
@@ -643,6 +648,11 @@ private void MatchProperties(PimsAcquisitionFile acquisitionFile, IEnumerable<Us
                     try
                     {
                         var foundProperty = _propertyRepository.GetByPin(pin);
+                        if (foundProperty.IsRetired.HasValue && foundProperty.IsRetired.Value)
+                        {
+                            throw new BusinessRuleViolationException("Retired property can not be selected.");
+                        }
+
                         acquisitionProperty.PropertyId = foundProperty.Internal_Id;
                         _propertyService.UpdateLocation(acquisitionProperty.Property, ref foundProperty, userOverrideCodes);
                         acquisitionProperty.Property = foundProperty;
diff --git a/source/backend/api/Services/DispositionFileService.cs b/source/backend/api/Services/DispositionFileService.cs
index a7ef0e820f..92a8b0d19d 100644
--- a/source/backend/api/Services/DispositionFileService.cs
+++ b/source/backend/api/Services/DispositionFileService.cs
@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
-using System.Text.RegularExpressions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Pims.Api.Constants;
@@ -74,7 +73,6 @@ public PimsDispositionFile Add(PimsDispositionFile dispositionFile, IEnumerable<
 
             dispositionFile.DispositionStatusTypeCode ??= EnumDispositionStatusTypeCode.UNKNOWN.ToString();
             dispositionFile.DispositionFileStatusTypeCode ??= EnumDispositionFileStatusTypeCode.ACTIVE.ToString();
-
             ValidateStaff(dispositionFile);
 
             MatchProperties(dispositionFile, userOverrides);
@@ -704,7 +702,12 @@ private void MatchProperties(PimsDispositionFile dispositionFile, IEnumerable<Us
                     var pid = dispProperty.Property.Pid.Value;
                     try
                     {
-                        var foundProperty = _propertyRepository.GetByPid(pid);
+                        var foundProperty = _propertyRepository.GetByPid(pid, true);
+                        if (foundProperty.IsRetired.HasValue && foundProperty.IsRetired.Value)
+                        {
+                            throw new BusinessRuleViolationException("Retired property can not be selected.");
+                        }
+
                         dispProperty.PropertyId = foundProperty.Internal_Id;
                         _propertyService.UpdateLocation(dispProperty.Property, ref foundProperty, overrideCodes);
                         dispProperty.Property = null;
@@ -718,7 +721,7 @@ private void MatchProperties(PimsDispositionFile dispositionFile, IEnumerable<Us
                         }
                         else
                         {
-                            throw new UserOverrideException(UserOverrideCode.DisposingPropertyNotInventoried, "You have added one or more properties to the disposition file that are not in the MoTI Inventory. Do you want to proceed?");
+                            throw new UserOverrideException(UserOverrideCode.DisposingPropertyNotInventoried, "You have added one or more properties to the disposition file that are not in the MOTI Inventory. Do you want to proceed?");
                         }
                     }
                 }
@@ -728,6 +731,11 @@ private void MatchProperties(PimsDispositionFile dispositionFile, IEnumerable<Us
                     try
                     {
                         var foundProperty = _propertyRepository.GetByPin(pin);
+                        if (foundProperty.IsRetired.HasValue && foundProperty.IsRetired.Value)
+                        {
+                            throw new BusinessRuleViolationException("Retired property can not be selected.");
+                        }
+
                         dispProperty.PropertyId = foundProperty.Internal_Id;
                         _propertyService.UpdateLocation(dispProperty.Property, ref foundProperty, overrideCodes);
                         dispProperty.Property = null;
diff --git a/source/backend/api/Services/LeaseService.cs b/source/backend/api/Services/LeaseService.cs
index beac175014..bda365ec2f 100644
--- a/source/backend/api/Services/LeaseService.cs
+++ b/source/backend/api/Services/LeaseService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
@@ -26,7 +27,6 @@ public class LeaseService : BaseService, ILeaseService
         private readonly ICoordinateTransformService _coordinateService;
         private readonly IPropertyRepository _propertyRepository;
         private readonly IPropertyLeaseRepository _propertyLeaseRepository;
-        private readonly ILookupRepository _lookupRepository;
         private readonly IEntityNoteRepository _entityNoteRepository;
         private readonly IInsuranceRepository _insuranceRepository;
         private readonly ILeaseTenantRepository _tenantRepository;
@@ -41,7 +41,6 @@ public LeaseService(
             IPropertyRepository propertyRepository,
             IPropertyLeaseRepository propertyLeaseRepository,
             IPropertyImprovementRepository propertyImprovementRepository,
-            ILookupRepository lookupRepository,
             IEntityNoteRepository entityNoteRepository,
             IInsuranceRepository insuranceRepository,
             ILeaseTenantRepository tenantRepository,
@@ -55,7 +54,6 @@ public LeaseService(
             _coordinateService = coordinateTransformService;
             _propertyRepository = propertyRepository;
             _propertyLeaseRepository = propertyLeaseRepository;
-            _lookupRepository = lookupRepository;
             _entityNoteRepository = entityNoteRepository;
             _propertyImprovementRepository = propertyImprovementRepository;
             _insuranceRepository = insuranceRepository;
@@ -213,16 +211,10 @@ public PimsLease Update(PimsLease lease, IEnumerable<UserOverrideCode> userOverr
             pimsUser.ThrowInvalidAccessToLeaseFile(lease.RegionCode);
 
             var currentProperties = _propertyLeaseRepository.GetAllByLeaseId(lease.LeaseId);
-            var newPropertiesAdded = lease.PimsPropertyLeases.Where(x => !currentProperties.Any(y => y.Internal_Id == x.Internal_Id)).ToList();
-
-            if(newPropertiesAdded.Any(x => x.Property.IsRetired.HasValue && x.Property.IsRetired.Value))
-            {
-                throw new BusinessRuleViolationException("Retired property can not be selected.");
-            }
 
             if (currentLease.LeaseStatusTypeCode != lease.LeaseStatusTypeCode)
             {
-                _entityNoteRepository.Add<PimsLeaseNote>(
+                _entityNoteRepository.Add(
                     new PimsLeaseNote()
                     {
                         LeaseId = currentLease.LeaseId,
@@ -300,6 +292,7 @@ private PimsLease AssociatePropertyLeases(PimsLease lease, IEnumerable<UserOverr
                 var existingPropertyLeases = _propertyLeaseRepository.GetAllByPropertyId(property.PropertyId);
                 var isPropertyOnOtherLease = existingPropertyLeases.Any(p => p.LeaseId != lease.Internal_Id);
                 var isPropertyOnThisLease = existingPropertyLeases.Any(p => p.LeaseId == lease.Internal_Id);
+
                 if (isPropertyOnOtherLease && !isPropertyOnThisLease && !userOverrides.Contains(UserOverrideCode.AddPropertyToInventory))
                 {
                     var genericOverrideErrorMsg = $"is attached to L-File # {existingPropertyLeases.FirstOrDefault().Lease.LFileNo}";
@@ -313,6 +306,7 @@ private PimsLease AssociatePropertyLeases(PimsLease lease, IEnumerable<UserOverr
                     }
                     string overrideError = $"Lng/Lat {propertyLease?.Property?.Location.Coordinate.X.ToString(CultureInfo.CurrentCulture) ?? string.Empty}, " +
                         $"{propertyLease?.Property?.Location.Coordinate.Y.ToString(CultureInfo.CurrentCulture) ?? string.Empty} {genericOverrideErrorMsg}";
+
                     throw new UserOverrideException(UserOverrideCode.AddPropertyToInventory, overrideError);
                 }
 
@@ -366,7 +360,12 @@ private void MatchProperties(PimsLease lease, IEnumerable<UserOverrideCode> user
                     var pid = leaseProperty.Property.Pid.Value;
                     try
                     {
-                        var foundProperty = _propertyRepository.GetByPid(pid);
+                        var foundProperty = _propertyRepository.GetByPid(pid, true);
+                        if (foundProperty.IsRetired.HasValue && foundProperty.IsRetired.Value)
+                        {
+                            throw new BusinessRuleViolationException("Retired property can not be selected.");
+                        }
+
                         leaseProperty.PropertyId = foundProperty.Internal_Id;
                         UpdateLocation(leaseProperty.Property, ref foundProperty, userOverrides);
                         leaseProperty.Property = foundProperty;
@@ -383,6 +382,11 @@ private void MatchProperties(PimsLease lease, IEnumerable<UserOverrideCode> user
                     try
                     {
                         var foundProperty = _propertyRepository.GetByPin(pin);
+                        if (foundProperty.IsRetired.HasValue && foundProperty.IsRetired.Value)
+                        {
+                            throw new BusinessRuleViolationException("Retired property can not be selected.");
+                        }
+
                         leaseProperty.PropertyId = foundProperty.Internal_Id;
                         UpdateLocation(leaseProperty.Property, ref foundProperty, userOverrides);
                         leaseProperty.Property = foundProperty;
diff --git a/source/backend/apimodels/Models/Concepts/DispositionFile/DispositionFilePropertyModel.cs b/source/backend/apimodels/Models/Concepts/DispositionFile/DispositionFilePropertyModel.cs
index f647b93c6b..1c6b86b04d 100644
--- a/source/backend/apimodels/Models/Concepts/DispositionFile/DispositionFilePropertyModel.cs
+++ b/source/backend/apimodels/Models/Concepts/DispositionFile/DispositionFilePropertyModel.cs
@@ -1,6 +1,4 @@
 using Pims.Api.Models.Concepts.File;
-using Pims.Api.Models.Base;
-using Pims.Api.Models.Concepts.Property;
 
 namespace Pims.Api.Models.Concepts.DispositionFile
 {
diff --git a/source/backend/dal/Repositories/AcquisitionFileRepository.cs b/source/backend/dal/Repositories/AcquisitionFileRepository.cs
index e3893d1a52..818a017d2c 100644
--- a/source/backend/dal/Repositories/AcquisitionFileRepository.cs
+++ b/source/backend/dal/Repositories/AcquisitionFileRepository.cs
@@ -657,7 +657,7 @@ public PimsAcquisitionFile Add(PimsAcquisitionFile acquisitionFile)
             using var scope = Logger.QueryScope();
             acquisitionFile.ThrowIfNull(nameof(acquisitionFile));
 
-            if (acquisitionFile.PimsPropertyAcquisitionFiles.Any(x => x.Property.IsRetired.HasValue && x.Property.IsRetired.Value))
+            if (acquisitionFile.PimsPropertyAcquisitionFiles.Any(x =>x.Property != null && x.Property.IsRetired.HasValue && x.Property.IsRetired.Value))
             {
                 throw new BusinessRuleViolationException("Retired property can not be selected.");
             }
diff --git a/source/backend/dal/Repositories/DispositionFileRepository.cs b/source/backend/dal/Repositories/DispositionFileRepository.cs
index d98e4f2a2d..7c272b6fa6 100644
--- a/source/backend/dal/Repositories/DispositionFileRepository.cs
+++ b/source/backend/dal/Repositories/DispositionFileRepository.cs
@@ -87,7 +87,7 @@ public PimsDispositionFile Add(PimsDispositionFile disposition)
             using var scope = Logger.QueryScope();
             disposition.ThrowIfNull(nameof(disposition));
 
-            if (disposition.PimsDispositionFileProperties.Any(x => x.Property.IsRetired.HasValue && x.Property.IsRetired.Value))
+            if (disposition.PimsDispositionFileProperties.Any(x => x.Property != null && x.Property.IsRetired.HasValue && x.Property.IsRetired.Value))
             {
                 throw new BusinessRuleViolationException("Retired property can not be selected.");
             }
diff --git a/source/backend/dal/Repositories/Interfaces/IPropertyRepository.cs b/source/backend/dal/Repositories/Interfaces/IPropertyRepository.cs
index 1eacb25cf7..acd8b9430a 100644
--- a/source/backend/dal/Repositories/Interfaces/IPropertyRepository.cs
+++ b/source/backend/dal/Repositories/Interfaces/IPropertyRepository.cs
@@ -20,7 +20,7 @@ public interface IPropertyRepository : IRepository<PimsProperty>
 
         PimsProperty GetByPid(string pid);
 
-        PimsProperty GetByPid(int pid);
+        PimsProperty GetByPid(int pid, bool includeRetired = false);
 
         PimsProperty GetByPin(int pin);
 
diff --git a/source/backend/dal/Repositories/LeaseRepository.cs b/source/backend/dal/Repositories/LeaseRepository.cs
index f16a28ea64..fe37a66c16 100644
--- a/source/backend/dal/Repositories/LeaseRepository.cs
+++ b/source/backend/dal/Repositories/LeaseRepository.cs
@@ -762,7 +762,7 @@ public PimsLease Add(PimsLease lease)
 
             User.ThrowIfNotAuthorized(Permissions.LeaseAdd);
 
-            if (lease.PimsPropertyLeases.Any(x => x.Property.IsRetired.HasValue && x.Property.IsRetired.Value))
+            if (lease.PimsPropertyLeases.Any(x => x.Property != null && x.Property.IsRetired.HasValue && x.Property.IsRetired.Value))
             {
                 throw new BusinessRuleViolationException("Retired property can not be selected.");
             }
diff --git a/source/backend/dal/Repositories/PropertyRepository.cs b/source/backend/dal/Repositories/PropertyRepository.cs
index 52b42feeb5..a1e319d669 100644
--- a/source/backend/dal/Repositories/PropertyRepository.cs
+++ b/source/backend/dal/Repositories/PropertyRepository.cs
@@ -185,38 +185,47 @@ public PimsProperty GetByPid(string pid)
         /// Get the property for the specified PID value.
         /// </summary>
         /// <param name="pid"></param>
+        /// <param name="includeRetired"></param>
         /// <returns></returns>
-        public PimsProperty GetByPid(int pid)
+        public PimsProperty GetByPid(int pid, bool includeRetired = false)
         {
             this.User.ThrowIfNotAllAuthorized(Permissions.PropertyView);
 
-            var property = this.Context.PimsProperties.AsNoTracking()
-                .Include(p => p.DistrictCodeNavigation)
-                .Include(p => p.RegionCodeNavigation)
-                .Include(p => p.PropertyTypeCodeNavigation)
-                .Include(p => p.PropertyStatusTypeCodeNavigation)
-                .Include(p => p.PropertyDataSourceTypeCodeNavigation)
-                .Include(p => p.PropertyClassificationTypeCodeNavigation)
-                .Include(p => p.PimsPropPropAnomalyTypes)
-                    .ThenInclude(t => t.PropertyAnomalyTypeCodeNavigation)
-                .Include(p => p.PimsPropPropRoadTypes)
-                    .ThenInclude(t => t.PropertyRoadTypeCodeNavigation)
-                .Include(p => p.PimsPropPropTenureTypes)
-                    .ThenInclude(t => t.PropertyTenureTypeCodeNavigation)
-                .Include(p => p.PropertyAreaUnitTypeCodeNavigation)
-                .Include(p => p.VolumetricTypeCodeNavigation)
-                .Include(p => p.VolumeUnitTypeCodeNavigation)
-                .Include(p => p.Address)
-                    .ThenInclude(a => a.RegionCodeNavigation)
-                .Include(p => p.Address)
-                    .ThenInclude(a => a.DistrictCodeNavigation)
-                .Include(p => p.Address)
-                    .ThenInclude(a => a.ProvinceState)
-                .Include(p => p.Address)
-                    .ThenInclude(a => a.Country)
-                    .OrderByDescending(p => p.PropertyId)
-                .FirstOrDefault(p => p.Pid == pid && p.IsRetired != true) ?? throw new KeyNotFoundException();
-            return property;
+            var query = Context.PimsProperties.AsNoTracking();
+
+            if(includeRetired)
+            {
+                query = query.Where(r => r.IsRetired.HasValue && r.IsRetired.Value);
+            }
+            else
+            {
+                query = query.Where(r => !r.IsRetired.HasValue || (r.IsRetired.HasValue && !r.IsRetired.Value));
+            }
+
+            return query.Include(p => p.DistrictCodeNavigation)
+                    .Include(p => p.RegionCodeNavigation)
+                    .Include(p => p.PropertyTypeCodeNavigation)
+                    .Include(p => p.PropertyStatusTypeCodeNavigation)
+                    .Include(p => p.PropertyDataSourceTypeCodeNavigation)
+                    .Include(p => p.PropertyClassificationTypeCodeNavigation)
+                    .Include(p => p.PimsPropPropAnomalyTypes)
+                        .ThenInclude(t => t.PropertyAnomalyTypeCodeNavigation)
+                    .Include(p => p.PimsPropPropRoadTypes)
+                        .ThenInclude(t => t.PropertyRoadTypeCodeNavigation)
+                    .Include(p => p.PimsPropPropTenureTypes)
+                        .ThenInclude(t => t.PropertyTenureTypeCodeNavigation)
+                    .Include(p => p.PropertyAreaUnitTypeCodeNavigation)
+                    .Include(p => p.VolumetricTypeCodeNavigation)
+                    .Include(p => p.VolumeUnitTypeCodeNavigation)
+                    .Include(p => p.Address)
+                        .ThenInclude(a => a.RegionCodeNavigation)
+                    .Include(p => p.Address)
+                        .ThenInclude(a => a.DistrictCodeNavigation)
+                    .Include(p => p.Address)
+                        .ThenInclude(a => a.ProvinceState)
+                    .Include(p => p.Address)
+                        .ThenInclude(a => a.Country)
+                        .OrderByDescending(p => p.PropertyId).FirstOrDefault(p => p.Pid == pid) ?? throw new KeyNotFoundException();
         }
 
         /// <summary>
diff --git a/source/backend/tests/unit/api/Services/AcquisitionFileServiceTest.cs b/source/backend/tests/unit/api/Services/AcquisitionFileServiceTest.cs
index 278ece2968..fa09ec97a6 100644
--- a/source/backend/tests/unit/api/Services/AcquisitionFileServiceTest.cs
+++ b/source/backend/tests/unit/api/Services/AcquisitionFileServiceTest.cs
@@ -199,6 +199,45 @@ public void Add_DuplicateTeam()
             repository.Verify(x => x.Add(It.IsAny<PimsAcquisitionFile>()), Times.Never);
         }
 
+        [Fact]
+        public void Add_WithRetiredProperty_Should_Fail()
+        {
+            // Arrange
+            var service = this.CreateAcquisitionServiceWithPermissions(Permissions.AcquisitionFileAdd);
+
+            var acqFile = EntityHelper.CreateAcquisitionFile();
+            PimsProperty property = new PimsProperty()
+            {
+                PropertyId = 100,
+                Pid = 1000,
+                IsRetired = true,
+            };
+
+            acqFile.PimsPropertyAcquisitionFiles.Add(new PimsPropertyAcquisitionFile()
+            {
+                Property = property,
+            });
+
+            var repository = this._helper.GetService<Mock<IAcquisitionFileRepository>>();
+            repository.Setup(x => x.Add(It.IsAny<PimsAcquisitionFile>())).Returns(acqFile);
+
+            var lookupRepository = this._helper.GetService<Mock<ILookupRepository>>();
+            lookupRepository.Setup(x => x.GetAllRegions()).Returns(new List<PimsRegion>() { new PimsRegion() { Code = 4, RegionName = "Cannot determine" } });
+
+            var userRepository = this._helper.GetService<Mock<IUserRepository>>();
+            userRepository.Setup(x => x.GetUserInfoByKeycloakUserId(It.IsAny<Guid>())).Returns(EntityHelper.CreateUser(1, Guid.NewGuid(), "Test", regionCode: 1));
+
+            var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(property);
+
+            // Act
+            Action act = () => service.Add(acqFile, new List<UserOverrideCode>());
+
+            // Assert
+            var ex = act.Should().Throw<BusinessRuleViolationException>();
+            ex.WithMessage("Retired property can not be selected.");
+        }
+
         #endregion
 
         #region GetById
@@ -1311,7 +1350,7 @@ public void UpdateProperties_Takes_Violation()
             repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(acqFile);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(property);
 
             var filePropertyRepository = this._helper.GetService<Mock<IAcquisitionFilePropertyRepository>>();
             filePropertyRepository.Setup(x => x.GetPropertiesByAcquisitionFileId(It.IsAny<long>())).Returns(acqFile.PimsPropertyAcquisitionFiles.ToList());
@@ -1343,7 +1382,7 @@ public void UpdateProperties_MatchProperties_Success()
             repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(acqFile);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(property);
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(1);
 
             var filePropertyRepository = this._helper.GetService<Mock<IAcquisitionFilePropertyRepository>>();
@@ -1384,7 +1423,7 @@ public void UpdateProperties_MatchProperties_NewProperty_Success()
             filePropertyRepository.Setup(x => x.Add(It.IsAny<PimsPropertyAcquisitionFile>())).Callback<PimsPropertyAcquisitionFile>(x => updatedAcquisitionFileProperty = x).Returns(acqFile.PimsPropertyAcquisitionFiles.FirstOrDefault());
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Throws<KeyNotFoundException>();
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(1);
 
             var coordinateService = this._helper.GetService<Mock<ICoordinateTransformService>>();
@@ -1446,7 +1485,7 @@ public void UpdateProperties_UpdatePropertyFile_Success()
             filePropertyRepository.Setup(x => x.GetPropertiesByAcquisitionFileId(It.IsAny<long>())).Returns(new List<PimsPropertyAcquisitionFile>() { new PimsPropertyAcquisitionFile() { Internal_Id = 1, Property = property, PropertyName = "updated" } });
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Throws<KeyNotFoundException>();
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(1);
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
@@ -1481,7 +1520,7 @@ public void UpdateProperties_RemovePropertyFile_Success()
             filePropertyRepository.Setup(x => x.GetPropertiesByAcquisitionFileId(It.IsAny<long>())).Returns(new List<PimsPropertyAcquisitionFile>() { new PimsPropertyAcquisitionFile() { Property = property } });
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Throws<KeyNotFoundException>();
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
             userRepository.Setup(x => x.GetUserInfoByKeycloakUserId(It.IsAny<Guid>())).Returns(EntityHelper.CreateUser("Test"));
@@ -1520,7 +1559,7 @@ public void UpdateProperties_RemoveProperty_Success()
             filePropertyRepository.Setup(x => x.GetAcquisitionFilePropertyRelatedCount(It.IsAny<long>())).Returns(1);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Throws<KeyNotFoundException>();
             propertyRepository.Setup(x => x.GetAllAssociationsById(It.IsAny<long>())).Returns(property);
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
@@ -1604,7 +1643,7 @@ public void UpdateProperties_ExistingTakes()
             filePropertyRepository.Setup(x => x.GetAcquisitionFilePropertyRelatedCount(It.IsAny<long>())).Returns(1);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Throws<KeyNotFoundException>();
             propertyRepository.Setup(x => x.GetAllAssociationsById(It.IsAny<long>())).Returns(property);
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
@@ -1638,7 +1677,7 @@ public void UpdateProperties_ExistingInterestHolders()
             filePropertyRepository.Setup(x => x.GetAcquisitionFilePropertyRelatedCount(It.IsAny<long>())).Returns(1);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Throws<KeyNotFoundException>();
             propertyRepository.Setup(x => x.GetAllAssociationsById(It.IsAny<long>())).Returns(property);
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
@@ -1696,7 +1735,7 @@ public void UpdateProperties_ValidatePropertyRegions_Success()
             repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(acqFile);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(property);
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(1);
 
             var filePropertyRepository = this._helper.GetService<Mock<IAcquisitionFilePropertyRepository>>();
@@ -1732,7 +1771,7 @@ public void UpdateProperties_ValidatePropertyRegions_Error()
             repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(acqFile);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(property);
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(3);
 
             var filePropertyRepository = this._helper.GetService<Mock<IAcquisitionFilePropertyRepository>>();
@@ -1748,6 +1787,54 @@ public void UpdateProperties_ValidatePropertyRegions_Error()
             var exception = act.Should().Throw<BadRequestException>();
             exception.WithMessage("You cannot add a property that is outside of your user account region(s)*"); // partial match on the error message - as documented by FluentAssertions
         }
+
+
+        [Fact]
+        public void UpdateProperties_WithRetiredProperty_Should_Fail()
+        {
+            // Arrange
+            var service = this.CreateAcquisitionServiceWithPermissions(Permissions.AcquisitionFileEdit, Permissions.PropertyAdd, Permissions.PropertyView);
+
+            var acqFile = EntityHelper.CreateAcquisitionFile();
+            acqFile.ConcurrencyControlNumber = 1;
+
+            PimsProperty property = EntityHelper.CreateProperty(12345, regionCode: 3);
+            PimsProperty retiredProperty = new PimsProperty()
+            {
+                PropertyId = 100,
+                Pid = 1000,
+                IsRetired = true,
+            };
+
+            acqFile.PimsPropertyAcquisitionFiles = new List<PimsPropertyAcquisitionFile>() {
+                new()
+                {
+                    Property = retiredProperty
+                }
+            };
+
+
+            var repository = this._helper.GetService<Mock<IAcquisitionFileRepository>>();
+            repository.Setup(x => x.GetRowVersion(It.IsAny<long>())).Returns(1);
+            repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(acqFile);
+
+            var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(retiredProperty);
+            propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(3);
+
+            var filePropertyRepository = this._helper.GetService<Mock<IAcquisitionFilePropertyRepository>>();
+            filePropertyRepository.Setup(x => x.GetPropertiesByAcquisitionFileId(It.IsAny<long>())).Returns(acqFile.PimsPropertyAcquisitionFiles.ToList());
+
+            var userRepository = this._helper.GetService<Mock<IUserRepository>>();
+            userRepository.Setup(x => x.GetUserInfoByKeycloakUserId(It.IsAny<Guid>())).Returns(EntityHelper.CreateUser(1, Guid.NewGuid(), "Test", regionCode: 1));
+
+            // Act
+            Action act = () => service.UpdateProperties(acqFile, new List<UserOverrideCode>());
+
+            // Assert
+            var ex = act.Should().Throw<BusinessRuleViolationException>();
+            ex.WithMessage("Retired property can not be selected.");
+        }
         #endregion
 
         #region Checklist
diff --git a/source/backend/tests/unit/api/Services/DispositionFileServiceTest.cs b/source/backend/tests/unit/api/Services/DispositionFileServiceTest.cs
index 874444e501..38cbe05ff0 100644
--- a/source/backend/tests/unit/api/Services/DispositionFileServiceTest.cs
+++ b/source/backend/tests/unit/api/Services/DispositionFileServiceTest.cs
@@ -313,6 +313,42 @@ public void Add_Success_IsContractor_AssignedToTeam()
             repository.Verify(x => x.Add(It.IsAny<PimsDispositionFile>()), Times.Once);
         }
 
+
+        [Fact]
+        public void Add_WithRetiredProperty_Should_Fail()
+        {
+            // Arrange
+            var service = this.CreateDispositionServiceWithPermissions(Permissions.DispositionAdd);
+
+            var dispositionFile = EntityHelper.CreateDispositionFile();
+            var pimsProperty = EntityHelper.CreateProperty(1000, isRetired: true);
+
+            dispositionFile.PimsDispositionFileProperties = new List<PimsDispositionFileProperty>()
+            {
+                new PimsDispositionFileProperty()
+                {
+                    DispositionFilePropertyId = 0,
+                    Property = pimsProperty,
+                },
+            };
+
+            var repository = this._helper.GetService<Mock<IDispositionFileRepository>>();
+            repository.Setup(x => x.Add(It.IsAny<PimsDispositionFile>())).Returns(dispositionFile);
+
+            var lookupRepository = this._helper.GetService<Mock<ILookupRepository>>();
+            lookupRepository.Setup(x => x.GetAllRegions()).Returns(new List<PimsRegion>() { new PimsRegion() { Code = 4, RegionName = "Cannot determine" } });
+
+            var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(pimsProperty);
+
+            // Act
+            Action act = () => service.Add(dispositionFile, new List<UserOverrideCode>());
+
+            // Assert
+            var ex = act.Should().Throw<BusinessRuleViolationException>();
+            ex.WithMessage("Retired property can not be selected.");
+        }
+
         #endregion
 
         #region Update
@@ -865,7 +901,7 @@ public void UpdateProperties_MatchProperties_Success()
             repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(dspFile);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(property);
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(1);
 
             var filePropertyRepository = this._helper.GetService<Mock<IDispositionFilePropertyRepository>>();
@@ -903,7 +939,7 @@ public void UpdateProperties_MatchProperties_NewProperty_UserOverride()
             filePropertyRepository.Setup(x => x.Add(It.IsAny<PimsDispositionFileProperty>())).Callback<PimsDispositionFileProperty>(x => updatedDispositionFileProperty = x).Returns(dspFile.PimsDispositionFileProperties.FirstOrDefault());
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Throws<KeyNotFoundException>();
 
             var coordinateService = this._helper.GetService<Mock<ICoordinateTransformService>>();
             coordinateService.Setup(x => x.TransformCoordinates(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<Coordinate>())).Returns(new Coordinate(924046.3314288399, 1088892.9140135897));
@@ -954,7 +990,7 @@ public void UpdateProperties_MatchProperties_NewProperty_Success()
             filePropertyRepository.Setup(x => x.Add(It.IsAny<PimsDispositionFileProperty>())).Callback<PimsDispositionFileProperty>(x => updatedDispositionFileProperty = x).Returns(dspFile.PimsDispositionFileProperties.FirstOrDefault());
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Throws<KeyNotFoundException>();
 
             var coordinateService = this._helper.GetService<Mock<ICoordinateTransformService>>();
             coordinateService.Setup(x => x.TransformCoordinates(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<Coordinate>())).Returns(new Coordinate(924046.3314288399, 1088892.9140135897));
@@ -1012,7 +1048,7 @@ public void UpdateProperties_UpdatePropertyFile_Success()
             filePropertyRepository.Setup(x => x.GetPropertiesByDispositionFileId(It.IsAny<long>())).Returns(new List<PimsDispositionFileProperty>() { new PimsDispositionFileProperty() { Internal_Id = 1, Property = property, PropertyName = "updated" } });
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Throws<KeyNotFoundException>();
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(1);
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
@@ -1044,7 +1080,7 @@ public void UpdateProperties_RemovePropertyFile_Success()
             filePropertyRepository.Setup(x => x.GetPropertiesByDispositionFileId(It.IsAny<long>())).Returns(new List<PimsDispositionFileProperty>() { new PimsDispositionFileProperty() { Property = property } });
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Throws<KeyNotFoundException>();
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
             userRepository.Setup(x => x.GetUserInfoByKeycloakUserId(It.IsAny<Guid>())).Returns(EntityHelper.CreateUser("Test"));
@@ -1080,7 +1116,7 @@ public void UpdateProperties_RemoveProperty_Success()
             filePropertyRepository.Setup(x => x.GetDispositionFilePropertyRelatedCount(It.IsAny<long>())).Returns(1);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Throws<KeyNotFoundException>();
             propertyRepository.Setup(x => x.GetAllAssociationsById(It.IsAny<long>())).Returns(property);
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
@@ -1157,7 +1193,7 @@ public void UpdateProperties_ValidatePropertyRegions_Success()
             repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(dspFile);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(property);
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(1);
 
             var filePropertyRepository = this._helper.GetService<Mock<IDispositionFilePropertyRepository>>();
@@ -1190,7 +1226,7 @@ public void UpdateProperties_ValidatePropertyRegions_Error()
             repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(dspFile);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(property);
             propertyRepository.Setup(x => x.GetPropertyRegion(It.IsAny<long>())).Returns(3);
 
             var filePropertyRepository = this._helper.GetService<Mock<IDispositionFilePropertyRepository>>();
@@ -1206,6 +1242,49 @@ public void UpdateProperties_ValidatePropertyRegions_Error()
             var exception = act.Should().Throw<BadRequestException>();
             exception.WithMessage("You cannot add a property that is outside of your user account region(s). Either select a different property, or get your system administrator to add the required region to your user account settings.");
         }
+
+        [Fact]
+        public void UpdateProperties_WithRetiredProperty_Should_Fail()
+        {
+            // Arrange
+            var service = this.CreateDispositionServiceWithPermissions(Permissions.DispositionEdit, Permissions.PropertyAdd, Permissions.PropertyView);
+
+            var dspFile = EntityHelper.CreateDispositionFile();
+            dspFile.ConcurrencyControlNumber = 1;
+
+            PimsProperty retiredProperty = new PimsProperty()
+            {
+                PropertyId = 100,
+                Pid = 1000,
+                IsRetired = true,
+            };
+
+            dspFile.PimsDispositionFileProperties.Add(new PimsDispositionFileProperty()
+            {
+                Property = retiredProperty,
+            });
+
+            var repository = this._helper.GetService<Mock<IDispositionFileRepository>>();
+            repository.Setup(x => x.GetRowVersion(It.IsAny<long>())).Returns(1);
+            repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(dspFile);
+
+            var filePropertyRepository = this._helper.GetService<Mock<IDispositionFilePropertyRepository>>();
+            filePropertyRepository.Setup(x => x.GetPropertiesByDispositionFileId(It.IsAny<long>())).Returns(dspFile.PimsDispositionFileProperties.ToList());
+
+            var userRepository = this._helper.GetService<Mock<IUserRepository>>();
+            userRepository.Setup(x => x.GetUserInfoByKeycloakUserId(It.IsAny<Guid>())).Returns(EntityHelper.CreateUser("Test"));
+
+            var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(retiredProperty);
+
+            // Act
+            Action act = () => service.UpdateProperties(dspFile, new List<UserOverrideCode>());
+
+            // Assert
+            var ex = act.Should().Throw<BusinessRuleViolationException>();
+            ex.WithMessage("Retired property can not be selected.");
+        }
+
         #endregion
 
         #region GetTeamMembers
diff --git a/source/backend/tests/unit/api/Services/LeaseServiceTest.cs b/source/backend/tests/unit/api/Services/LeaseServiceTest.cs
index ad6dd27423..6638a4035c 100644
--- a/source/backend/tests/unit/api/Services/LeaseServiceTest.cs
+++ b/source/backend/tests/unit/api/Services/LeaseServiceTest.cs
@@ -58,7 +58,7 @@ public void Add_Success()
             leaseRepository.Setup(x => x.Add(It.IsAny<PimsLease>())).Returns(lease);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(lease.PimsPropertyLeases.FirstOrDefault().Property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(lease.PimsPropertyLeases.FirstOrDefault().Property);
 
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
             userRepository.Setup(x => x.GetByKeycloakUserId(It.IsAny<Guid>())).Returns(user);
@@ -115,6 +115,46 @@ public void Add_InvalidAccessToLeaseFile()
             leaseRepository.Verify(x => x.Add(It.IsAny<PimsLease>()), Times.Never);
         }
 
+        [Fact]
+        public void Add_WithRetiredProperty_Should_Fail()
+        {
+            // Arrange
+            var lease = EntityHelper.CreateLease(1);
+            lease.RegionCode = 1;
+            var user = new PimsUser();
+            user.PimsRegionUsers.Add(new PimsRegionUser() { RegionCode = lease.RegionCode.Value });
+
+            PimsProperty retiredProperty = new PimsProperty()
+            {
+                PropertyId = 100,
+                Pid = 1000,
+                IsRetired = true,
+            };
+
+            lease.PimsPropertyLeases.Add(new PimsPropertyLease()
+            {
+                Property = retiredProperty,
+            });
+
+            var service = this.CreateLeaseService(Permissions.LeaseAdd);
+
+            var leaseRepository = this._helper.GetService<Mock<ILeaseRepository>>();
+            leaseRepository.Setup(x => x.Add(It.IsAny<PimsLease>())).Returns(lease);
+
+            var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(retiredProperty);
+
+            var userRepository = this._helper.GetService<Mock<IUserRepository>>();
+            userRepository.Setup(x => x.GetByKeycloakUserId(It.IsAny<Guid>())).Returns(user);
+
+            // Act
+            Action act = () => service.Add(lease, new List<UserOverrideCode>());
+
+            // Assert
+            var ex = act.Should().Throw<BusinessRuleViolationException>();
+            ex.WithMessage("Retired property can not be selected.");
+        }
+
         #endregion
 
         #region Update
@@ -196,7 +236,7 @@ public void Update_Properties_Success()
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
 
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(lease.PimsPropertyLeases.FirstOrDefault().Property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(lease.PimsPropertyLeases.FirstOrDefault().Property);
             leaseRepository.Setup(x => x.GetNoTracking(It.IsAny<long>())).Returns(lease);
             leaseRepository.Setup(x => x.Get(It.IsAny<long>())).Returns(EntityHelper.CreateLease(1));
             userRepository.Setup(x => x.GetByKeycloakUserId(It.IsAny<Guid>())).Returns(new PimsUser());
@@ -220,21 +260,18 @@ public void Update_Properties_WithRetiredProperty_Should_Fail()
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
 
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(lease.PimsPropertyLeases.FirstOrDefault().Property);
+            PimsProperty property = new PimsProperty()
+            {
+                PropertyId = 100,
+                Pid = 1,
+                IsRetired = true,
+            };
+
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(property);
             leaseRepository.Setup(x => x.GetNoTracking(It.IsAny<long>())).Returns(lease);
             leaseRepository.Setup(x => x.Get(It.IsAny<long>())).Returns(EntityHelper.CreateLease(1));
             userRepository.Setup(x => x.GetByKeycloakUserId(It.IsAny<Guid>())).Returns(new PimsUser());
 
-            lease.PimsPropertyLeases.Add(new PimsPropertyLease()
-            {
-                PropertyId = 100,
-                Property = new PimsProperty()
-                {
-                    Pid = 1,
-                    IsRetired = true,
-                }
-            });
-
             // Act
             Action act = () => service.Update(lease, new List<UserOverrideCode>() { UserOverrideCode.AddLocationToProperty });
 
@@ -256,7 +293,7 @@ public void Update_Properties_Delete_Success()
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
             propertyLeaseRepository.Setup(x => x.GetAllByLeaseId(It.IsAny<long>())).Returns(lease.PimsPropertyLeases);
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(lease.PimsPropertyLeases.FirstOrDefault().Property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(lease.PimsPropertyLeases.FirstOrDefault().Property);
             leaseRepository.Setup(x => x.GetNoTracking(It.IsAny<long>())).Returns(lease);
             leaseRepository.Setup(x => x.Get(It.IsAny<long>())).Returns(EntityHelper.CreateLease(1));
             userRepository.Setup(x => x.GetByKeycloakUserId(It.IsAny<Guid>())).Returns(new PimsUser());
@@ -284,7 +321,7 @@ public void Update_Properties_Delete_POI_Success()
             var userRepository = this._helper.GetService<Mock<IUserRepository>>();
 
             propertyLeaseRepository.Setup(x => x.GetAllByLeaseId(It.IsAny<long>())).Returns(lease.PimsPropertyLeases);
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(deletedProperty);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(deletedProperty);
             propertyRepository.Setup(x => x.GetAllAssociationsById(It.IsAny<long>())).Returns(lease.PimsPropertyLeases.FirstOrDefault().Property);
             leaseRepository.Setup(x => x.GetNoTracking(It.IsAny<long>())).Returns(lease);
             leaseRepository.Setup(x => x.Get(It.IsAny<long>())).Returns(EntityHelper.CreateLease(1));
diff --git a/source/backend/tests/unit/api/Services/ResearchFileServiceTest.cs b/source/backend/tests/unit/api/Services/ResearchFileServiceTest.cs
index 6047df68ad..c94e8b5ac6 100644
--- a/source/backend/tests/unit/api/Services/ResearchFileServiceTest.cs
+++ b/source/backend/tests/unit/api/Services/ResearchFileServiceTest.cs
@@ -116,7 +116,7 @@ public void UpdateProperties_MatchProperties_PID_Success()
             repository.Setup(x => x.GetById(It.IsAny<long>())).Returns(researchFile);
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(property);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(property);
 
             var filePropertyRepository = this._helper.GetService<Mock<IResearchFilePropertyRepository>>();
             filePropertyRepository.Setup(x => x.GetAllByResearchFileId(It.IsAny<long>())).Returns(researchFile.PimsPropertyResearchFiles.ToList());
@@ -181,7 +181,7 @@ public void UpdateProperties_MatchProperties_PID_NewProperty_Success()
             filePropertyRepository.Setup(x => x.Add(It.IsAny<PimsPropertyResearchFile>())).Callback<PimsPropertyResearchFile>(x => updatedResearchFileProperty = x).Returns(researchFile.PimsPropertyResearchFiles.FirstOrDefault());
 
             var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Throws<KeyNotFoundException>();
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Throws<KeyNotFoundException>();
 
             var coordinateService = this._helper.GetService<Mock<ICoordinateTransformService>>();
             coordinateService.Setup(x => x.TransformCoordinates(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<Coordinate>())).Returns(new Coordinate(924046.3314288399, 1088892.9140135897));
diff --git a/source/backend/tests/unit/dal/Repositories/DispositionFileRepositoryTest.cs b/source/backend/tests/unit/dal/Repositories/DispositionFileRepositoryTest.cs
index d17709d75d..7664599a05 100644
--- a/source/backend/tests/unit/dal/Repositories/DispositionFileRepositoryTest.cs
+++ b/source/backend/tests/unit/dal/Repositories/DispositionFileRepositoryTest.cs
@@ -66,7 +66,7 @@ public void Add_Success()
         }
 
         [Fact]
-        public void Add__WithRetiredProperty_Should_Fail()
+        public void Add_WithRetiredProperty_Should_Fail()
         {
             // Arrange
             var helper = new TestHelper();
diff --git a/source/backend/tests/unit/dal/Repositories/LeaseRepositoryTest.cs b/source/backend/tests/unit/dal/Repositories/LeaseRepositoryTest.cs
index 084b5b7d29..a037bb32d2 100644
--- a/source/backend/tests/unit/dal/Repositories/LeaseRepositoryTest.cs
+++ b/source/backend/tests/unit/dal/Repositories/LeaseRepositoryTest.cs
@@ -608,7 +608,7 @@ public void Update_Lease_Properties_AddPropertyInLease()
             helper.SaveChanges();
 
             var propertyRepository = helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(propertyOne);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(propertyOne);
 
             var repository = helper.GetService<Mock<IPropertyLeaseRepository>>();
             repository.Setup(x => x.GetAllByPropertyId(It.IsAny<long>())).Returns(propertyOne.PimsPropertyLeases);
@@ -642,7 +642,7 @@ public void Update_Lease_Properties_AddPropertyInLeaseOverride()
             propertyOne.PimsPropertyLeases = new List<PimsPropertyLease>() { new Dal.Entities.PimsPropertyLease() { LeaseId = leaseTwo.LeaseId, PropertyId = propertyOne.PropertyId, Lease = leaseTwo } };
 
             var propertyRepository = helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(propertyOne);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(propertyOne);
 
             var repository = helper.GetService<Mock<IPropertyLeaseRepository>>();
             repository.Setup(x => x.GetAllByPropertyId(It.IsAny<long>())).Returns(propertyOne.PimsPropertyLeases);
@@ -680,7 +680,7 @@ public void Update_Lease_Properties_Update()
             helper.SaveChanges();
 
             var propertyRepository = helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>())).Returns(propertyOne);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(propertyOne);
 
             var repository = helper.GetService<Mock<IPropertyLeaseRepository>>();
             repository.Setup(x => x.GetAllByPropertyId(It.IsAny<long>())).Returns(new List<PimsPropertyLease>());

From deef01c2b1e7d1e0eaa0440e837511169a747e1a Mon Sep 17 00:00:00 2001
From: Herrera <eduardo.herrera@quartech.com>
Date: Mon, 25 Mar 2024 09:19:07 -0700
Subject: [PATCH 2/3] - test updates

---
 .../tests/unit/dal/Repositories/LeaseRepositoryTest.cs    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/backend/tests/unit/dal/Repositories/LeaseRepositoryTest.cs b/source/backend/tests/unit/dal/Repositories/LeaseRepositoryTest.cs
index a037bb32d2..ab773e17f5 100644
--- a/source/backend/tests/unit/dal/Repositories/LeaseRepositoryTest.cs
+++ b/source/backend/tests/unit/dal/Repositories/LeaseRepositoryTest.cs
@@ -601,14 +601,16 @@ public void Update_Lease_Properties_AddPropertyInLease()
             var propertyOne = EntityHelper.CreateProperty(1);
             var context = helper.CreatePimsContext(user, true);
             context.AddRange(propertyOne, lease);
+
             var service = helper.Create<LeaseService>(user);
             helper.SaveChanges();
+
             var leaseTwo = context.CreateLease(2, addProperty: false);
             propertyOne.PimsPropertyLeases = new List<PimsPropertyLease>() { new Dal.Entities.PimsPropertyLease() { LeaseId = leaseTwo.LeaseId, Lease = leaseTwo, PropertyId = propertyOne.PropertyId } };
             helper.SaveChanges();
 
             var propertyRepository = helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(propertyOne);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(propertyOne);
 
             var repository = helper.GetService<Mock<IPropertyLeaseRepository>>();
             repository.Setup(x => x.GetAllByPropertyId(It.IsAny<long>())).Returns(propertyOne.PimsPropertyLeases);
@@ -642,7 +644,7 @@ public void Update_Lease_Properties_AddPropertyInLeaseOverride()
             propertyOne.PimsPropertyLeases = new List<PimsPropertyLease>() { new Dal.Entities.PimsPropertyLease() { LeaseId = leaseTwo.LeaseId, PropertyId = propertyOne.PropertyId, Lease = leaseTwo } };
 
             var propertyRepository = helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(propertyOne);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(propertyOne);
 
             var repository = helper.GetService<Mock<IPropertyLeaseRepository>>();
             repository.Setup(x => x.GetAllByPropertyId(It.IsAny<long>())).Returns(propertyOne.PimsPropertyLeases);
@@ -680,7 +682,7 @@ public void Update_Lease_Properties_Update()
             helper.SaveChanges();
 
             var propertyRepository = helper.GetService<Mock<IPropertyRepository>>();
-            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), false)).Returns(propertyOne);
+            propertyRepository.Setup(x => x.GetByPid(It.IsAny<int>(), true)).Returns(propertyOne);
 
             var repository = helper.GetService<Mock<IPropertyLeaseRepository>>();
             repository.Setup(x => x.GetAllByPropertyId(It.IsAny<long>())).Returns(new List<PimsPropertyLease>());

From aaf4ab6882a067f0e926d894e43d7ce6af51198c Mon Sep 17 00:00:00 2001
From: Herrera <eduardo.herrera@quartech.com>
Date: Mon, 25 Mar 2024 13:22:52 -0700
Subject: [PATCH 3/3] - linting

---
 source/backend/api/Services/LeaseService.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/backend/api/Services/LeaseService.cs b/source/backend/api/Services/LeaseService.cs
index bda365ec2f..f82313fdd7 100644
--- a/source/backend/api/Services/LeaseService.cs
+++ b/source/backend/api/Services/LeaseService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Globalization;
 using System.Linq;
 using System.Security.Claims;