Resolve 8 critical SonarQube issues (BLOCKER + CRITICAL non-S3776) #2

Merged
bermudalamb merged 10 commits from fix/Sonarqube-Tech-Debt into main 2026-05-19 17:26:28 -05:00
4 changed files with 4 additions and 2 deletions
Showing only changes of commit e01cfae359 - Show all commits
@@ -29,6 +29,6 @@ public class CalculationFilterGroup
public bool IsValid() public bool IsValid()
{ {
return GetValidFilters().Any(); return Filters != null && Filters.Any(x => x.IsValid());
} }
} }
@@ -13,6 +13,7 @@ public static class QueryConfigExtensions
return queryConfig.Values.SelectMany(value => value.CalculationDataColumnIds) return queryConfig.Values.SelectMany(value => value.CalculationDataColumnIds)
.Union(queryConfig.Values.SelectMany(x => x.FilterGroups.SelectMany(y => y.GetValidFilters().Select(f => f.DataColumnId)))) .Union(queryConfig.Values.SelectMany(x => x.FilterGroups.SelectMany(y => y.GetValidFilters().Select(f => f.DataColumnId))))
.Union(queryConfig.Rows.Select(row => row.DataColumnId)) .Union(queryConfig.Rows.Select(row => row.DataColumnId))
// FilterGroup.Filters is pre-filtered at construction (see FilterGroup.cs JsonConstructor); no GetValidFilters() equivalent is needed here.
.Union(queryConfig.FilterGroups.SelectMany(filterGroup => filterGroup.Filters.Select(filter => filter.DataColumnId))) .Union(queryConfig.FilterGroups.SelectMany(filterGroup => filterGroup.Filters.Select(filter => filter.DataColumnId)))
.ToArray(); .ToArray();
} }
@@ -29,6 +29,6 @@ public class CalculationFilterGroup
public bool IsValid() public bool IsValid()
{ {
return GetValidFilters().Any(); return Filters != null && Filters.Any(x => x.IsValid());
} }
} }
@@ -13,6 +13,7 @@ public static class QueryConfigExtensions
return queryConfig.Values.SelectMany(value => value.CalculationDataColumnIds) return queryConfig.Values.SelectMany(value => value.CalculationDataColumnIds)
.Union(queryConfig.Values.SelectMany(x => x.FilterGroups.SelectMany(y => y.GetValidFilters().Select(f => f.DataColumnId)))) .Union(queryConfig.Values.SelectMany(x => x.FilterGroups.SelectMany(y => y.GetValidFilters().Select(f => f.DataColumnId))))
.Union(queryConfig.Rows.Select(row => row.DataColumnId)) .Union(queryConfig.Rows.Select(row => row.DataColumnId))
// FilterGroup.Filters is pre-filtered at construction (see FilterGroup.cs JsonConstructor); no GetValidFilters() equivalent is needed here.
.Union(queryConfig.FilterGroups.SelectMany(filterGroup => filterGroup.Filters.Select(filter => filter.DataColumnId))) .Union(queryConfig.FilterGroups.SelectMany(filterGroup => filterGroup.Filters.Select(filter => filter.DataColumnId)))
.ToArray(); .ToArray();
} }