Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Foundatio.CommandQuery.Endpoints/DispatcherEndpoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ protected virtual async Task<IResult> Send(

try
{
var result = await mediator.InvokeAsync(request, cancellationToken).ConfigureAwait(false);
var result = await mediator.InvokeAsync<object>(request, cancellationToken).ConfigureAwait(false);
return TypedResults.Ok(result);
}
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ await DataContext
.ConfigureAwait(false);

if (result == null)
return Result<TReadModel>.NotFound("Could not map read model.");
return Result.NotFound("Could not map read model.");

return Result<TReadModel>.Success(result);
return result;
}

public virtual async ValueTask<Result<TReadModel>> HandleAsync(
Expand All @@ -105,7 +105,7 @@ public virtual async ValueTask<Result<TReadModel>> HandleAsync(
: default;

if (entity == null && !request.Upsert)
return Result<TReadModel>.NotFound($"Entity with id '{request.Id}' not found.");
return Result.NotFound($"Entity with id '{request.Id}' not found.");

// create entity if not found
if (entity == null)
Expand Down Expand Up @@ -153,9 +153,9 @@ await DataContext
.ConfigureAwait(false);

if (result == null)
return Result<TReadModel>.NotFound("Could not map read model.");
return Result.NotFound("Could not map read model.");

return Result<TReadModel>.Success(result);
return result;
}

public virtual async ValueTask<Result<TReadModel>> HandleAsync(
Expand All @@ -173,7 +173,7 @@ public virtual async ValueTask<Result<TReadModel>> HandleAsync(
.ConfigureAwait(false);

if (entity == null)
return Result<TReadModel>.NotFound($"Entity with id '{request.Id}' not found.");
return Result.NotFound($"Entity with id '{request.Id}' not found.");

// read the entity before deleting it
var query = DataContext
Expand Down Expand Up @@ -222,6 +222,6 @@ await DataContext
.SaveChangesAsync(cancellationToken)
.ConfigureAwait(false);

return Result<TReadModel>.Success(result);
return result;
}
}
10 changes: 5 additions & 5 deletions src/Foundatio.CommandQuery.EntityFramework/EntityQueryHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ public virtual async ValueTask<Result<TReadModel>> HandleAsync(
.ConfigureAwait(false);

if (result == null)
return Result<TReadModel>.NotFound($"Entity with id '{request.Id}' not found.");
return Result.NotFound($"Entity with id '{request.Id}' not found.");

return Result<TReadModel>.Success(result);
return result;
}

public virtual async ValueTask<Result<IReadOnlyList<TReadModel>>> HandleAsync(
Expand All @@ -92,7 +92,7 @@ public virtual async ValueTask<Result<IReadOnlyList<TReadModel>>> HandleAsync(
.ToListAsync(cancellationToken)
.ConfigureAwait(false);

return Result<IReadOnlyList<TReadModel>>.Success(results);
return results;
}

public virtual async ValueTask<Result<QueryResult<TReadModel>>> HandleAsync(
Expand Down Expand Up @@ -124,7 +124,7 @@ public virtual async ValueTask<Result<QueryResult<TReadModel>>> HandleAsync(

// short circuit if total is zero
if (total == 0)
return Result<QueryResult<TReadModel>>.Success(new());
return new QueryResult<TReadModel>();

query = query.Page(queryDefinition.Page.Value, queryDefinition.PageSize.Value);
}
Expand All @@ -142,6 +142,6 @@ public virtual async ValueTask<Result<QueryResult<TReadModel>>> HandleAsync(
Data = results
};

return Result<QueryResult<TReadModel>>.Success(queryResult);
return queryResult;
}
}
Loading