Skip to content

ProjectInto fixes discovered during RavenDB 6 spike #3746

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

Merged
DavidBoike merged 1 commit into from
Oct 13, 2023
Merged

ProjectInto fixes discovered during RavenDB 6 spike #3746

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
10 changes: 5 additions & 5 deletions src/ServiceControl.Persistence.RavenDb5/ErrorMessagesDataStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ bool includeSystemMessages
.Statistics(out var stats)
.Sort(sortInfo)
.Paging(pagingInfo)
.ProjectInto<FailedMessage>()
.OfType<FailedMessage>()
.TransformToMessageView();

var results = await query.ToListAsync();
Expand All @@ -75,7 +75,7 @@ bool includeSystemMessages
.Statistics(out var stats)
.Sort(sortInfo)
.Paging(pagingInfo)
.ProjectInto<FailedMessage>()
.OfType<FailedMessage>()
.TransformToMessageView();

var results = await query.ToListAsync();
Expand All @@ -100,7 +100,7 @@ SortInfo sortInfo
.Where(m => m.ReceivingEndpointName == endpointName)
.Sort(sortInfo)
.Paging(pagingInfo)
.ProjectInto<FailedMessage>()
.OfType<FailedMessage>()
.TransformToMessageView();

var results = await query.ToListAsync();
Expand All @@ -123,7 +123,7 @@ bool includeSystemMessages
.Where(m => m.ConversationId == conversationId)
.Sort(sortInfo)
.Paging(pagingInfo)
.ProjectInto<FailedMessage>()
.OfType<FailedMessage>()
.TransformToMessageView();

var results = await query.ToListAsync();
Expand All @@ -145,7 +145,7 @@ SortInfo sortInfo
.Search(x => x.Query, searchTerms)
.Sort(sortInfo)
.Paging(pagingInfo)
.ProjectInto<FailedMessage>()
.OfType<FailedMessage>()
.TransformToMessageView();

var results = await query.ToListAsync();
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl.Persistence.RavenDb5/Transformers/MessagesViewTransformer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace ServiceControl.CompositeViews.Messages

static class MessagesViewTransformer //https://ravendb.net/docs/article-page/4.2/csharp/migration/client-api/session/querying/transformers
{
public static IQueryable<MessagesView> TransformToMessageView(this IRavenQueryable<FailedMessage> query)
public static IQueryable<MessagesView> TransformToMessageView(this IQueryable<FailedMessage> query)
{
var results =
from message in query
Expand Down
12 changes: 6 additions & 6 deletions src/ServiceControl.Persistence.Tests.RavenDb5/CompositeViews/MessagesViewTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ public async Task TimeSent_is_not_cast_to_DateTimeMin_if_null()
using (var session = DocumentStore.OpenAsyncSession())
{
var query = session.Query<MessagesViewIndex.SortAndFilterOptions, MessagesViewIndex>()
.ProjectInto<FailedMessage>()
.Customize(x => x.WaitForNonStaleResults());
.Customize(x => x.WaitForNonStaleResults())
.OfType<FailedMessage>();

var messagesWithNoTimestamp = await MessagesViewTransformer.TransformToMessageView(query).ToArrayAsync();

Expand Down Expand Up @@ -233,8 +233,8 @@ public async Task Correct_status_for_failed_messages(FailedMessageStatus failedM
using (var session = DocumentStore.OpenAsyncSession())
{
var query = session.Query<FailedMessage>()
.ProjectInto<FailedMessage>()
.Customize(x => x.WaitForNonStaleResults());
.Customize(x => x.WaitForNonStaleResults())
.OfType<FailedMessage>();

var result = await MessagesViewTransformer.TransformToMessageView(query).ToListAsync();

Expand Down Expand Up @@ -276,8 +276,8 @@ public async Task Correct_status_for_repeated_errors()
{
var query = session
.Query<FailedMessage>()
.ProjectInto<FailedMessage>()
.Customize(x => x.WaitForNonStaleResults());
.Customize(x => x.WaitForNonStaleResults())
.OfType<FailedMessage>();

var result = await MessagesViewTransformer.TransformToMessageView(query).ToListAsync();

Expand Down