- (Reporting) Fixed issue in attribute Expression Helper that caused …

…unnecessary index scans (Fixes SparkDevNetwork#5575)
Jon-Corey · Sep 6, 2023 · 3cac498 · 3cac498
1 parent c1560a8
commit 3cac498
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Rock/Utility/ExpressionHelper.cs b/Rock/Utility/ExpressionHelper.cs
@@ -177,7 +177,9 @@ public static Expression GetAttributeExpression( IService serviceInstance, Param
             }
 
             var service = new AttributeValueService( ( RockContext ) serviceInstance.Context );
-            var attributeValues = service.Queryable();
+
+            var attributeValues = service.Queryable().Where( v =>
+                v.EntityId.HasValue );
 
             AttributeCache attributeCache = null;
 
@@ -254,7 +256,7 @@ public static Expression GetAttributeExpression( IService serviceInstance, Param
                 return new NoAttributeFilterExpression();
             }
 
-            IQueryable<int> ids = attributeValues.Select( v => v.EntityId ?? 0 );
+            IQueryable<int> ids = attributeValues.Select( v => v.EntityId.Value );
 
             MemberExpression propertyExpression = Expression.Property( parameterExpression, "Id" );
             ConstantExpression idsExpression = Expression.Constant( ids.AsQueryable(), typeof( IQueryable<int> ) );