diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetEnricher.cs b/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetEnricher.cs similarity index 98% rename from src/Squidex.Domain.Apps.Entities/Assets/AssetEnricher.cs rename to src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetEnricher.cs index 3a1b802e8..342a2a218 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetEnricher.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetEnricher.cs @@ -13,7 +13,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Reflection; -namespace Squidex.Domain.Apps.Entities.Assets +namespace Squidex.Domain.Apps.Entities.Assets.Queries { public sealed class AssetEnricher : IAssetEnricher { diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetQueryService.cs b/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryService.cs similarity index 97% rename from src/Squidex.Domain.Apps.Entities/Assets/AssetQueryService.cs rename to src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryService.cs index fbdf3ab1c..640e95817 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetQueryService.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryService.cs @@ -8,11 +8,10 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Squidex.Domain.Apps.Entities.Assets.Queries; using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Infrastructure; -namespace Squidex.Domain.Apps.Entities.Assets +namespace Squidex.Domain.Apps.Entities.Assets.Queries { public sealed class AssetQueryService : IAssetQueryService { diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs index d320f7f4f..b128aabae 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs @@ -13,6 +13,7 @@ using GraphQL; using GraphQL.DataLoader; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Domain.Apps.Entities.Contents.GraphQL.Types; +using Squidex.Domain.Apps.Entities.Contents.Queries; using Squidex.Infrastructure.Json.Objects; using Squidex.Infrastructure.Log; diff --git a/src/Squidex.Domain.Apps.Entities/Contents/IEnrichedContentEntity.cs b/src/Squidex.Domain.Apps.Entities/Contents/IEnrichedContentEntity.cs index a9ebc61f2..66d125dd9 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/IEnrichedContentEntity.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/IEnrichedContentEntity.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System.Collections.Generic; using Squidex.Domain.Apps.Core.Contents; namespace Squidex.Domain.Apps.Entities.Contents diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs b/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs similarity index 99% rename from src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs rename to src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs index 69f044b87..fe504e987 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs @@ -18,7 +18,7 @@ using Squidex.Infrastructure.Json.Objects; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Reflection; -namespace Squidex.Domain.Apps.Entities.Contents +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public sealed class ContentEnricher : IContentEnricher { diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs b/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs index b39d4bad0..80b7e13ce 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs @@ -17,7 +17,6 @@ using Squidex.Domain.Apps.Core.GenerateEdmSchema; using Squidex.Domain.Apps.Core.GenerateJsonSchema; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Apps; -using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Json; @@ -26,7 +25,7 @@ using Squidex.Infrastructure.Queries; using Squidex.Infrastructure.Queries.Json; using Squidex.Infrastructure.Queries.OData; -namespace Squidex.Domain.Apps.Entities +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public class ContentQueryParser : CachingProviderBase { diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs b/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryService.cs similarity index 99% rename from src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs rename to src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryService.cs index a87da0c46..ada073af3 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryService.cs @@ -22,7 +22,7 @@ using Squidex.Shared; #pragma warning disable RECS0147 -namespace Squidex.Domain.Apps.Entities.Contents +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public sealed class ContentQueryService : IContentQueryService { diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentVersionLoader.cs b/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentVersionLoader.cs similarity index 96% rename from src/Squidex.Domain.Apps.Entities/Contents/ContentVersionLoader.cs rename to src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentVersionLoader.cs index 7016766ef..c020703af 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentVersionLoader.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentVersionLoader.cs @@ -11,7 +11,7 @@ using Orleans; using Squidex.Infrastructure; using Squidex.Infrastructure.Log; -namespace Squidex.Domain.Apps.Entities.Contents +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public sealed class ContentVersionLoader : IContentVersionLoader { diff --git a/src/Squidex.Domain.Apps.Entities/Contents/QueryExecutionContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/Queries/QueryExecutionContext.cs similarity index 98% rename from src/Squidex.Domain.Apps.Entities/Contents/QueryExecutionContext.cs rename to src/Squidex.Domain.Apps.Entities/Contents/Queries/QueryExecutionContext.cs index 2c50a0d1e..7e68202c9 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/QueryExecutionContext.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Queries/QueryExecutionContext.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Infrastructure; -namespace Squidex.Domain.Apps.Entities.Contents +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public class QueryExecutionContext { diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index dec4b85a2..b95e8f9db 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -34,6 +34,7 @@ using Squidex.Domain.Apps.Entities.Comments; using Squidex.Domain.Apps.Entities.Comments.Commands; using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Contents.GraphQL; +using Squidex.Domain.Apps.Entities.Contents.Queries; using Squidex.Domain.Apps.Entities.Contents.Text; using Squidex.Domain.Apps.Entities.History; using Squidex.Domain.Apps.Entities.History.Notifications; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetEnricherTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetEnricherTests.cs similarity index 98% rename from tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetEnricherTests.cs rename to tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetEnricherTests.cs index 751098d67..b5da3100c 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetEnricherTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetEnricherTests.cs @@ -13,7 +13,7 @@ using Squidex.Domain.Apps.Core.Tags; using Squidex.Infrastructure; using Xunit; -namespace Squidex.Domain.Apps.Entities.Assets +namespace Squidex.Domain.Apps.Entities.Assets.Queries { public class AssetEnricherTests { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetQueryServiceTests.cs similarity index 97% rename from tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetQueryServiceTests.cs rename to tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetQueryServiceTests.cs index 23e696f8d..434339896 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetQueryServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetQueryServiceTests.cs @@ -10,14 +10,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using FakeItEasy; -using Squidex.Domain.Apps.Entities.Assets.Queries; using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Infrastructure; using Squidex.Infrastructure.Queries; using Xunit; -namespace Squidex.Domain.Apps.Entities.Assets +namespace Squidex.Domain.Apps.Entities.Assets.Queries { public class AssetQueryServiceTests { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentEnricherReferencesTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherReferencesTests.cs similarity index 99% rename from tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentEnricherReferencesTests.cs rename to tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherReferencesTests.cs index ca4337237..6c89788e5 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentEnricherReferencesTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherReferencesTests.cs @@ -18,7 +18,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Json.Objects; using Xunit; -namespace Squidex.Domain.Apps.Entities.Contents +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public class ContentEnricherReferencesTests { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentEnricherTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherTests.cs similarity index 98% rename from tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentEnricherTests.cs rename to tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherTests.cs index d9461caad..0fd177204 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentEnricherTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherTests.cs @@ -14,7 +14,7 @@ using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Infrastructure; using Xunit; -namespace Squidex.Domain.Apps.Entities.Contents +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public class ContentEnricherTests { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentQueryServiceTests.cs similarity index 99% rename from tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs rename to tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentQueryServiceTests.cs index 3d4f9f91b..eb4671583 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentQueryServiceTests.cs @@ -29,7 +29,7 @@ using Xunit; #pragma warning disable SA1401 // Fields must be private -namespace Squidex.Domain.Apps.Entities.Contents +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public class ContentQueryServiceTests { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentVersionLoaderTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentVersionLoaderTests.cs similarity index 97% rename from tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentVersionLoaderTests.cs rename to tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentVersionLoaderTests.cs index b6b1d43b6..1497bd2c7 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentVersionLoaderTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentVersionLoaderTests.cs @@ -13,7 +13,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Orleans; using Xunit; -namespace Squidex.Domain.Apps.Entities.Contents +namespace Squidex.Domain.Apps.Entities.Contents.Queries { public class ContentVersionLoaderTests {