From c32c1fb3c693e4fd42df6a553fcb371e6f15e471 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 7 Sep 2020 19:15:28 +0200 Subject: [PATCH] Many fixes. --- .../Assets/MongoAssetFolderRepository.cs | 2 +- .../Assets/MongoAssetRepository.cs | 4 +- .../Contents/Operations/QueryIdsAsync.cs | 2 +- .../Contents/ContentSchedulerGrain.cs | 2 + .../Contents/GraphQL/GraphQLModel.cs | 1 - .../Contents/GraphQL/IGraphModel.cs | 1 - .../GraphQL/Types/AppMutationsGraphType.cs | 109 +++++++----------- .../GraphQL/Types/AppQueriesGraphType.cs | 1 - .../Contents/GraphQL/Types/ContentActions.cs | 62 ++++++---- .../Api/Controllers/Apps/Models/PatternDto.cs | 1 - .../Apps/Models/UpdatePatternDto.cs | 1 - .../Assets/Models/AssetFolderDto.cs | 1 - .../Assets/Models/CreateAssetFolderDto.cs | 1 - .../Assets/Models/RenameAssetFolderDto.cs | 1 - .../Contents/Models/ChangeStatusDto.cs | 1 - .../Controllers/Contents/Models/ContentDto.cs | 1 - .../Contents/Models/ScheduleJobDto.cs | 1 - .../History/Models/HistoryEventDto.cs | 1 - .../Api/Controllers/Rules/Models/RuleDto.cs | 1 - .../Controllers/Rules/Models/RuleEventDto.cs | 1 - .../Controllers/Schemas/Models/SchemaDto.cs | 1 - .../Contents/GraphQL/TestAsset.cs | 1 - .../Contents/GraphQL/TestContent.cs | 1 - 23 files changed, 88 insertions(+), 110 deletions(-) diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository.cs index e53092444..e4139890a 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository.cs @@ -87,7 +87,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets private static string GetIdField() { - return BsonClassMap.LookupClassMap(typeof(MongoAssetFolderEntity)).GetMemberMap(nameof(MongoAssetFolderEntity.Id)).ElementName; + return BsonClassMap.LookupClassMap(typeof(MongoAssetFolderEntity)).GetMemberMap(nameof(MongoAssetFolderEntity.DocumentId)).ElementName; } } } diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs index b6b884ff9..d9c8bfaf5 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs @@ -102,7 +102,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets using (Profiler.TraceMethod("QueryAsyncByIds")) { var assetEntities = - await Collection.Find(BuildFilter(appId, ids)).Only(x => x.DocumentId) + await Collection.Find(BuildFilter(appId, ids)).Only(x => x.Id) .ToListAsync(); return assetEntities.Select(x => DomainId.Create(x[IdField.Value].AsString)).ToList(); @@ -188,7 +188,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets var documentIds = ids.Select(x => DomainId.Combine(appId, x)); return Filter.And( - Filter.In(x => x.Id, documentIds), + Filter.In(x => x.DocumentId, documentIds), Filter.Ne(x => x.IsDeleted, true)); } diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryIdsAsync.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryIdsAsync.cs index 33a5690e5..5b5f46034 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryIdsAsync.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryIdsAsync.cs @@ -70,7 +70,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Operations var filter = BuildFilter(filterNode.AdjustToModel(schema.SchemaDef), appId, schemaId); var contentEntities = - await Collection.Find(filter).Only(x => x.DocumentId, x => x.IndexedSchemaId) + await Collection.Find(filter).Only(x => x.Id, x => x.IndexedSchemaId) .ToListAsync(); return contentEntities.Select(x => (DomainId.Create(x[SchemaIdField.Value].AsString), DomainId.Create(x[IdField.Value].AsString))).ToList(); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs index cb266aa37..13b585b2d 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs @@ -82,7 +82,9 @@ namespace Squidex.Domain.Apps.Entities.Contents var command = new ChangeContentStatus { Actor = job.ScheduledBy, + AppId = content.AppId, ContentId = id, + SchemaId = content.SchemaId, Status = job.Status, StatusJobId = job.Id }; diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs index af927136c..c2cfdf690 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using GraphQL; -using GraphQL.Resolvers; using GraphQL.Types; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Schemas; diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/IGraphModel.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/IGraphModel.cs index 7af0a1312..85eaa9978 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/IGraphModel.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/IGraphModel.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using GraphQL.Types; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Schemas; diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs index 32b972ae4..bd13a7e1a 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs @@ -5,11 +5,9 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Collections.Generic; using GraphQL.Types; using Squidex.Domain.Apps.Entities.Schemas; -using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { @@ -19,6 +17,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { foreach (var schema in schemas) { + var appId = schema.AppId; + var schemaId = schema.NamedId(); var schemaType = schema.TypeName(); var schemaName = schema.DisplayName(); @@ -27,74 +27,53 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types var inputType = new ContentDataInputGraphType(schema, schemaName, schemaType, model); - AddContentCreate(schemaId, schemaType, schemaName, inputType, contentType); - AddContentUpdate(schemaType, schemaName, inputType, contentType); - AddContentPatch(schemaType, schemaName, inputType, contentType); - AddContentChangeStatus(schemaType, schemaName, contentType); - AddContentDelete(schemaType, schemaName); - } + AddField(new FieldType + { + Name = $"create{schemaType}Content", + Arguments = ContentActions.Create.Arguments(inputType), + ResolvedType = contentType, + Resolver = ContentActions.Create.Resolver(appId, schemaId), + Description = $"Creates an {schemaName} content." + }); - Description = "The app mutations."; - } + AddField(new FieldType + { + Name = $"update{schemaType}Content", + Arguments = ContentActions.UpdateOrPatch.Arguments(inputType), + ResolvedType = contentType, + Resolver = ContentActions.UpdateOrPatch.Update(appId, schemaId), + Description = $"Update an {schemaName} content by id." + }); - private void AddContentCreate(NamedId schemaId, string schemaType, string schemaName, ContentDataInputGraphType inputType, IGraphType contentType) - { - AddField(new FieldType - { - Name = $"create{schemaType}Content", - Arguments = ContentActions.Create.Arguments(inputType), - ResolvedType = contentType, - Resolver = ContentActions.Create.Resolver(schemaId), - Description = $"Creates an {schemaName} content." - }); - } + AddField(new FieldType + { + Name = $"patch{schemaType}Content", + Arguments = ContentActions.UpdateOrPatch.Arguments(inputType), + ResolvedType = contentType, + Resolver = ContentActions.UpdateOrPatch.Patch(appId, schemaId), + Description = $"Patch an {schemaName} content by id." + }); - private void AddContentUpdate(string schemaType, string schemaName, ContentDataInputGraphType inputType, IGraphType contentType) - { - AddField(new FieldType - { - Name = $"update{schemaType}Content", - Arguments = ContentActions.UpdateOrPatch.Arguments(inputType), - ResolvedType = contentType, - Resolver = ContentActions.UpdateOrPatch.Update, - Description = $"Update an {schemaName} content by id." - }); - } + AddField(new FieldType + { + Name = $"publish{schemaType}Content", + Arguments = ContentActions.ChangeStatus.Arguments, + ResolvedType = contentType, + Resolver = ContentActions.ChangeStatus.Resolver(appId, schemaId), + Description = $"Publish a {schemaName} content." + }); - private void AddContentPatch(string schemaType, string schemaName, ContentDataInputGraphType inputType, IGraphType contentType) - { - AddField(new FieldType - { - Name = $"patch{schemaType}Content", - Arguments = ContentActions.UpdateOrPatch.Arguments(inputType), - ResolvedType = contentType, - Resolver = ContentActions.UpdateOrPatch.Patch, - Description = $"Patch an {schemaName} content by id." - }); - } - - private void AddContentChangeStatus(string schemaType, string schemaName, IGraphType contentType) - { - AddField(new FieldType - { - Name = $"publish{schemaType}Content", - Arguments = ContentActions.ChangeStatus.Arguments, - ResolvedType = contentType, - Resolver = ContentActions.ChangeStatus.Resolver, - Description = $"Publish a {schemaName} content." - }); - } + AddField(new FieldType + { + Name = $"delete{schemaType}Content", + Arguments = ContentActions.Delete.Arguments, + ResolvedType = EntitySavedGraphType.NonNull, + Resolver = ContentActions.Delete.Resolver(appId, schemaId), + Description = $"Delete an {schemaName} content." + }); + } - private void AddContentDelete(string schemaType, string schemaName) - { - AddField(new FieldType - { - Name = $"delete{schemaType}Content", - Arguments = ContentActions.Delete.Arguments, - ResolvedType = EntitySavedGraphType.NonNull, - Resolver = ContentActions.Delete.Resolver, - Description = $"Delete an {schemaName} content." - }); + Description = "The app mutations."; } } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppQueriesGraphType.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppQueriesGraphType.cs index fdf2f42f3..cfbf746bf 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppQueriesGraphType.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppQueriesGraphType.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Collections.Generic; using GraphQL.Types; using Squidex.Domain.Apps.Entities.Schemas; diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs index d135e5c01..1b5f09331 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs @@ -164,14 +164,14 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }; } - public static IFieldResolver Resolver(NamedId schemaId) + public static IFieldResolver Resolver(NamedId appId, NamedId schemaId) { - return ResolveAsync(c => + return ResolveAsync(appId, schemaId, c => { var contentPublish = c.GetArgument("publish"); var contentData = GetContentData(c); - return new CreateContent { SchemaId = schemaId, Data = contentData, Publish = contentPublish }; + return new CreateContent { Data = contentData, Publish = contentPublish }; }); } } @@ -206,21 +206,27 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }; } - public static readonly IFieldResolver Update = ResolveAsync(c => + public static IFieldResolver Update(NamedId appId, NamedId schemaId) { - var contentId = c.GetArgument("id"); - var contentData = GetContentData(c); + return ResolveAsync(appId, schemaId, c => + { + var contentId = c.GetArgument("id"); + var contentData = GetContentData(c); - return new UpdateContent { ContentId = contentId, Data = contentData }; - }); + return new UpdateContent { ContentId = contentId, Data = contentData }; + }); + } - public static readonly IFieldResolver Patch = ResolveAsync(c => + public static IFieldResolver Patch(NamedId appId, NamedId schemaId) { - var contentId = c.GetArgument("id"); - var contentData = GetContentData(c); + return ResolveAsync(appId, schemaId, c => + { + var contentId = c.GetArgument("id"); + var contentData = GetContentData(c); - return new PatchContent { ContentId = contentId, Data = contentData }; - }); + return new PatchContent { ContentId = contentId, Data = contentData }; + }); + } } public static class ChangeStatus @@ -257,14 +263,17 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types } }; - public static readonly IFieldResolver Resolver = ResolveAsync(c => + public static IFieldResolver Resolver(NamedId appId, NamedId schemaId) { - var contentId = c.GetArgument("id"); - var contentStatus = new Status(c.GetArgument("status")); - var contentDueTime = c.GetArgument("dueTime"); + return ResolveAsync(appId, schemaId, c => + { + var contentId = c.GetArgument("id"); + var contentStatus = new Status(c.GetArgument("status")); + var contentDueTime = c.GetArgument("dueTime"); - return new ChangeContentStatus { ContentId = contentId, Status = contentStatus, DueTime = contentDueTime }; - }); + return new ChangeContentStatus { ContentId = contentId, Status = contentStatus, DueTime = contentDueTime }; + }); + } } public static class Delete @@ -287,12 +296,15 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types } }; - public static readonly IFieldResolver Resolver = ResolveAsync(c => + public static IFieldResolver Resolver(NamedId appId, NamedId schemaId) { - var contentId = c.GetArgument("id"); + return ResolveAsync(appId, schemaId, c => + { + var contentId = c.GetArgument("id"); - return new DeleteContent { ContentId = contentId }; - }); + return new DeleteContent { ContentId = contentId }; + }); + } } private static NamedContentData GetContentData(IResolveFieldContext c) @@ -302,7 +314,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types return source.ToNamedContentData((IComplexGraphType)c.FieldDefinition.Arguments.Find("data").Flatten()); } - private static IFieldResolver ResolveAsync(Func action) + private static IFieldResolver ResolveAsync(NamedId appId, NamedId schemaId, Func action) { return new FuncFieldResolver>(async c => { @@ -312,6 +324,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { var command = action(c); + command.AppId = appId; + command.SchemaId = schemaId; command.ExpectedVersion = c.GetArgument("expectedVersion", EtagVersion.Any); var commandContext = await e.CommandBus.PublishAsync(command); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/PatternDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/PatternDto.cs index 1968c6101..359068a34 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/PatternDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/PatternDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using Squidex.Domain.Apps.Core.Apps; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdatePatternDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdatePatternDto.cs index 1302f3708..946c63e8e 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdatePatternDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdatePatternDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Validation; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFolderDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFolderDto.cs index baa0832d1..a69014509 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFolderDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFolderDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/CreateAssetFolderDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/CreateAssetFolderDto.cs index 14d2760b5..52afd4dab 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/CreateAssetFolderDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/CreateAssetFolderDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/RenameAssetFolderDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/RenameAssetFolderDto.cs index a1ccd509f..f699987c9 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/RenameAssetFolderDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/RenameAssetFolderDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Validation; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ChangeStatusDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ChangeStatusDto.cs index 245c5c3bc..9268a7741 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ChangeStatusDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ChangeStatusDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs index 075162bc8..43d7ff444 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Linq; using NodaTime; using Squidex.Areas.Api.Controllers.Schemas.Models; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ScheduleJobDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ScheduleJobDto.cs index 43fe91977..e2fea0d0b 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ScheduleJobDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ScheduleJobDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Infrastructure; diff --git a/backend/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs b/backend/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs index 53ad27ee9..a799992c2 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using NodaTime; using Squidex.Domain.Apps.Entities.History; using Squidex.Infrastructure; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs index 31b2b0823..7ac68cf54 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using Newtonsoft.Json; using NodaTime; using Squidex.Areas.Api.Controllers.Rules.Models.Converters; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventDto.cs index a31713c0f..2002534df 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using NodaTime; using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Entities.Rules; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs index 8b1873f94..e53f9d30c 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using NodaTime; using Squidex.Areas.Api.Controllers.Contents; using Squidex.Domain.Apps.Entities.Schemas; diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs index b56d77751..be86b99fb 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Linq; using NodaTime; using Squidex.Domain.Apps.Core.Assets; diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestContent.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestContent.cs index 2cf14e663..8462d5305 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestContent.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestContent.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Collections.Generic; using NodaTime; using Squidex.Domain.Apps.Core.Contents;