Browse Source

Minor code improvement.

pull/214/head
Sebastian Stehle 8 years ago
parent
commit
309a033cd9
  1. 9
      src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs
  2. 1
      tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs
  3. 1
      tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs
  4. 1
      tools/Migrate_01/Migration01_FromCqrs.cs

9
src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs

@ -9,7 +9,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.OData.UriParser; using Microsoft.OData.UriParser;
using MongoDB.Bson;
using MongoDB.Driver; using MongoDB.Driver;
using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.Contents;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
@ -80,17 +79,13 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors
filters.Add(filter); filters.Add(filter);
} }
if (filters.Count > 1) if (filters.Count == 1)
{
return Filter.And(filters);
}
else if (filters.Count == 1)
{ {
return filters[0]; return filters[0];
} }
else else
{ {
return new BsonDocument(); return Filter.And(filters);
} }
} }
} }

1
tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs

@ -11,7 +11,6 @@ using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using FakeItEasy; using FakeItEasy;
using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.EventSourcing;
using Squidex.Infrastructure.Log;
using Squidex.Infrastructure.States; using Squidex.Infrastructure.States;
using Squidex.Infrastructure.Tasks; using Squidex.Infrastructure.Tasks;
using Squidex.Infrastructure.TestHelpers; using Squidex.Infrastructure.TestHelpers;

1
tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs

@ -12,7 +12,6 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using FakeItEasy; using FakeItEasy;
using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.EventSourcing;
using Squidex.Infrastructure.Log;
using Squidex.Infrastructure.States; using Squidex.Infrastructure.States;
using Squidex.Infrastructure.TestHelpers; using Squidex.Infrastructure.TestHelpers;
using Xunit; using Xunit;

1
tools/Migrate_01/Migration01_FromCqrs.cs

@ -12,7 +12,6 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps;
using Squidex.Domain.Apps.Entities.Apps.State;
using Squidex.Domain.Apps.Entities.Assets; using Squidex.Domain.Apps.Entities.Assets;
using Squidex.Domain.Apps.Entities.Contents.State; using Squidex.Domain.Apps.Entities.Contents.State;
using Squidex.Domain.Apps.Entities.Rules; using Squidex.Domain.Apps.Entities.Rules;

Loading…
Cancel
Save