Browse Source

Code cleanup.

pull/405/head
Sebastian 7 years ago
parent
commit
f895cc6b9e
  1. 2
      src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Middlewares.cs
  2. 2
      src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Extensions.cs
  3. 1
      src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs
  4. 1
      tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs
  5. 2
      tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentQueryServiceTests.cs

2
src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Middlewares.cs

@ -34,7 +34,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
.WriteProperty("status", "failed") .WriteProperty("status", "failed")
.WriteProperty("field", context.FieldName)); .WriteProperty("field", context.FieldName));
throw ex; throw;
} }
}; };
}); });

2
src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Extensions.cs

@ -42,7 +42,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
public static async Task<IReadOnlyList<T>> LoadManyAsync<TKey, T>(this IDataLoader<TKey, T> dataLoader, ICollection<TKey> keys) where T : class public static async Task<IReadOnlyList<T>> LoadManyAsync<TKey, T>(this IDataLoader<TKey, T> dataLoader, ICollection<TKey> keys) where T : class
{ {
var contents = await Task.WhenAll(keys.Select(x => dataLoader.LoadAsync(x))); var contents = await Task.WhenAll(keys.Select(dataLoader.LoadAsync));
return contents.Where(x => x != null).ToList(); return contents.Where(x => x != null).ToList();
} }

1
src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs

@ -17,7 +17,6 @@ using Squidex.Domain.Apps.Entities.Apps.Services;
using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.Security; using Squidex.Infrastructure.Security;
using Squidex.Shared; using Squidex.Shared;
using Squidex.Shared.Identity;
using Squidex.Web; using Squidex.Web;
namespace Squidex.Areas.Api.Controllers.Apps namespace Squidex.Areas.Api.Controllers.Apps

1
tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs

@ -38,7 +38,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
protected readonly IAppEntity app; protected readonly IAppEntity app;
protected readonly IAssetQueryService assetQuery = A.Fake<IAssetQueryService>(); protected readonly IAssetQueryService assetQuery = A.Fake<IAssetQueryService>();
protected readonly IContentQueryService contentQuery = A.Fake<IContentQueryService>(); protected readonly IContentQueryService contentQuery = A.Fake<IContentQueryService>();
protected readonly IDependencyResolver dependencyResolver;
protected readonly IJsonSerializer serializer = TestUtils.CreateSerializer(TypeNameHandling.None); protected readonly IJsonSerializer serializer = TestUtils.CreateSerializer(TypeNameHandling.None);
protected readonly ISchemaEntity schema; protected readonly ISchemaEntity schema;
protected readonly Context requestContext; protected readonly Context requestContext;

2
tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentQueryServiceTests.cs

@ -435,7 +435,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries
private void SetupContents(Status[] status, int total, List<Guid> ids, bool includeDraft) private void SetupContents(Status[] status, int total, List<Guid> ids, bool includeDraft)
{ {
A.CallTo(() => contentRepository.QueryAsync(app, schema, A<Status[]>.That.Is(status), A<HashSet<Guid>>.Ignored, includeDraft)) A.CallTo(() => contentRepository.QueryAsync(app, schema, A<Status[]>.That.Is(status), A<HashSet<Guid>>.Ignored, includeDraft))
.Returns(ResultList.Create(total, ids.Select(x => CreateContent(x)).Shuffle())); .Returns(ResultList.Create(total, ids.Select(CreateContent).Shuffle()));
} }
private void SetupContents(Status[] status, List<Guid> ids, bool includeDraft) private void SetupContents(Status[] status, List<Guid> ids, bool includeDraft)

Loading…
Cancel
Save