Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use constant parameters to query events #485

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Use constant parameters to query events #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/FasTnT.Application/Database/DataSources/Utils/QueryParameterExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,13 @@ public static Expression<Func<T, bool>> OrElse<T>(this Expression<Func<T, bool>>
{
return Expression.Lambda<Func<T, bool>>(Expression.OrElse(expr1.Body, Expression.Invoke(expr2, expr1.Parameters[0])), expr1.Parameters[0]);
}
internal static IQueryable<TQuery> WhereIn<TQuery, TKey>(this IQueryable<TQuery> queryable, Expression<Func<TQuery, TKey>> keySelector, IEnumerable<TKey> values)
{
var method = values.GetType().GetMethod("Contains");
var instance = Expression.Constant(values);
var expression = Expression.Call(instance, method, keySelector.Body);
var lambda = Expression.Lambda<Func<TQuery, bool>>(expression, keySelector.Parameters);

return queryable.Where(lambda);
}
}
2 changes: 1 addition & 1 deletion src/FasTnT.Application/Database/EpcisContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class EpcisContext : DbContext
{
public EpcisContext(DbContextOptions<EpcisContext> options) : base(options)
{
ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
}

public IQueryable<Event> QueryEvents(IEnumerable<QueryParameter> parameters)
Expand Down
8 changes: 4 additions & 4 deletions src/FasTnT.Application/Handlers/DataRetrieverHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public async Task<List<Event>> QueryEventsAsync(IEnumerable<QueryParameter> para
new QueryParameter { Name = "nextPageToken", Values = ["0"] }
});

var maxEventCount = parameters.SingleOrDefault(x => x.Name == "maxEventCount")?.AsInt();
var maxResults = parameters.LastOrDefault(x => x.Name == "maxEventCount")?.AsInt() ?? constants.Value.MaxEventsReturnedInQuery;
var eventIds = await context
.QueryEvents(userParameters.Union(parameters))
.Select(x => x.Id)
Expand All @@ -32,16 +32,16 @@ public async Task<List<Event>> QueryEventsAsync(IEnumerable<QueryParameter> para
{
return [];
}
if (eventIds.Count >= (maxEventCount ?? constants.Value.MaxEventsReturnedInQuery))
if (eventIds.Count >= maxResults)
{
throw new EpcisException(ExceptionType.QueryTooLargeException, "Query returned too many results");
}

var events = await context.Set<Event>()
.Where(x => eventIds.Contains(x.Id))
.WhereIn(x => x.Id, eventIds)
.ToListAsync(cancellationToken);

return [.. events.OrderBy(e => eventIds.IndexOf(e.Id))];
return events.OrderBy(e => eventIds.IndexOf(e.Id)).ToList();
}

public async Task<List<MasterData>> QueryMasterDataAsync(IEnumerable<QueryParameter> parameters, CancellationToken cancellationToken)
Expand Down
Loading