From a5508276348b3e7f90fc143b2dbfef87f6e2282e Mon Sep 17 00:00:00 2001 From: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Date: Thu, 4 Jul 2024 08:36:19 -0700 Subject: [PATCH] psp-8545 Correct behaviour when there is no property ownership specified. (#4149) Co-authored-by: Alejandro Sanchez --- source/backend/dal/Helpers/Extensions/PropertyExtensions.cs | 2 +- source/backend/dal/Repositories/PropertyRepository.cs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/backend/dal/Helpers/Extensions/PropertyExtensions.cs b/source/backend/dal/Helpers/Extensions/PropertyExtensions.cs index 5088f8b291..58bb7c92c5 100644 --- a/source/backend/dal/Helpers/Extensions/PropertyExtensions.cs +++ b/source/backend/dal/Helpers/Extensions/PropertyExtensions.cs @@ -98,7 +98,7 @@ private static ExpressionStarter GenerateCommonPropertyQuery(Pim ExpressionStarter ownershipBuilder; - if (filter.Ownership.Count > 0) + if (filter.Ownership.Count > 0 && filter.Ownership.FirstOrDefault() != string.Empty) { // Property ownership filters ownershipBuilder = isRetired ? PredicateBuilder.New(p => p.IsRetired == true) : PredicateBuilder.New(p => false); diff --git a/source/backend/dal/Repositories/PropertyRepository.cs b/source/backend/dal/Repositories/PropertyRepository.cs index 62c7833740..2001c79ec7 100644 --- a/source/backend/dal/Repositories/PropertyRepository.cs +++ b/source/backend/dal/Repositories/PropertyRepository.cs @@ -526,8 +526,8 @@ public HashSet GetMatchingIds(PropertyFilterCriteria filter) p.PimsPropPropAnomalyTypes.Any(at => filter.AnomalyIds.Contains(at.PropertyAnomalyTypeCode))); } - - var authorizationTypes = new List(){ + var authorizationTypes = new List() + { "NOI", "Section 15", "Section 16", @@ -567,7 +567,6 @@ public HashSet GetMatchingIds(PropertyFilterCriteria filter) { predicate.And(ownershipBuilder); // Only apply ownership filter if at least one type is specified. } - predicate.And(ownershipBuilder); return Context.PimsProperties.AsNoTracking() .Where(predicate)