Merge pull request #1 from brandonhenricks/feature/expression-visitor…

…-refactor

Feature/expression visitor refactor

src/XperienceCommunity.DataContext/ContentItemContext.cs

@@ -65,7 +65,7 @@ public ContentItemContext(IWebsiteChannelContext websiteChannelContext,
  () => _contentQueryExecutor.ExecuteQueryAsync(queryBuilder, queryOptions, cancellationToken),
  GetCacheKey(queryBuilder));
 
- return result.FirstOrDefault();
+ return result?.FirstOrDefault();
  }
 
  public IDataContext<T> IncludeTotalCount(bool includeTotalCount)
@@ -132,9 +132,11 @@ public async Task<IEnumerable<T>> ToListAsync(CancellationToken cancellationToke
 
  var queryOptions = CreateQueryOptions();
 
- return await GetOrCacheAsync(
+ var results= await GetOrCacheAsync(
  () => _contentQueryExecutor.ExecuteQueryAsync(queryBuilder, queryOptions, cancellationToken),
  GetCacheKey(queryBuilder));
+
+ return results ?? [];
  }
 
  /// <summary>
@@ -223,9 +225,14 @@ private ContentItemQueryBuilder BuildQuery(Expression expression, int? topN = nu
  subQuery.Offset(_offset.Item1.Value, _offset.Item2.Value);
  }
 
- var visitor = new ContentItemQueryExpressionVisitor(subQuery);
+ var manager = new QueryParameterManager(subQuery);
+
+ var visitor = new ContentItemQueryExpressionVisitor(manager);
 
  visitor.Visit(expression);
+
+ // Apply conditions before returning the query parameters
+ manager.ApplyConditions();
  });
 
  if (!string.IsNullOrEmpty(_language))
@@ -267,7 +274,7 @@ private string GetCacheKey(ContentItemQueryBuilder queryBuilder)
  /// <param name="executeFunc">The function to execute if cache is bypassed or data is not found.</param>
  /// <param name="cacheKey">The cache key.</param>
  /// <returns>A task that represents the asynchronous operation. The task result contains the cached or executed data.</returns>
- private async Task<T> GetOrCacheAsync<T>(Func<Task<T>> executeFunc, string cacheKey) where T : class
+ private async Task<T?> GetOrCacheAsync<T>(Func<Task<T>> executeFunc, string cacheKey) where T : class
  {
  if (_websiteChannelContext.IsPreview)
  {
@@ -280,6 +287,13 @@ private async Task<T> GetOrCacheAsync<T>(Func<Task<T>> executeFunc, string cache
  {
  var result = await executeFunc();
 
+ cs.BoolCondition = result != null;
+
+ if (!cs.Cached)
+ {
+ return result;
+ }
+
  cs.CacheDependency = CacheHelper.GetCacheDependency(GetCacheDependencies(result));
 
  return result;