Cleanup (#412)

* Remove pubsub

* Removed unused code

* Dispatch removed.

* Build fixed.

* Namespace fixed and dead code removed.

src/Squidex.Domain.Apps.Core.Model/Rules/Triggers/AssetChangedTriggerV2.cs

@@ -5,7 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Squidex.Infrastructure;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Domain.Apps.Core.Rules.Triggers
 {

src/Squidex.Domain.Apps.Core.Model/Rules/Triggers/ContentChangedTriggerV2.cs

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 using System.Collections.ObjectModel;
-using Squidex.Infrastructure;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Domain.Apps.Core.Rules.Triggers
 {

src/Squidex.Domain.Apps.Core.Model/Rules/Triggers/SchemaChangedTrigger.cs

@@ -5,7 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Squidex.Infrastructure;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Domain.Apps.Core.Rules.Triggers
 {

src/Squidex.Domain.Apps.Core.Model/Rules/Triggers/UsageTrigger.cs

@@ -5,7 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Squidex.Infrastructure;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Domain.Apps.Core.Rules.Triggers
 {

src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs

@@ -60,17 +60,17 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets.Visitors
                 Filter.Eq(x => x.IsDeleted, false)
             };
 
-            var filter = query.BuildFilter<MongoAssetEntity>(false);
+            var (filter, last) = query.BuildFilter<MongoAssetEntity>(false);
 
-            if (filter.Filter != null)
+            if (filter != null)
             {
-                if (filter.Last)
+                if (last)
                 {
-                    filters.Add(filter.Filter);
+                    filters.Add(filter);
                 }
                 else
                 {
-                    filters.Insert(0, filter.Filter);
+                    filters.Insert(0, filter);
                 }
             }
 

src/Squidex.Domain.Apps.Entities/Assets/Edm/EdmAssetModel.cs

@@ -1,55 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschränkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-using Microsoft.OData.Edm;
-using Squidex.Infrastructure;
-
-namespace Squidex.Domain.Apps.Entities.Assets.Edm
-{
-    public static class EdmAssetModel
-    {
-        public static readonly IEdmModel Edm;
-
-        static EdmAssetModel()
-        {
-            var entityType = new EdmEntityType("Squidex", "Asset");
-
-            void AddProperty(string name, EdmPrimitiveTypeKind type)
-            {
-                entityType.AddStructuralProperty(name.ToCamelCase(), type);
-            }
-
-            AddProperty(nameof(IAssetEntity.Id), EdmPrimitiveTypeKind.String);
-            AddProperty(nameof(IAssetEntity.Created), EdmPrimitiveTypeKind.DateTimeOffset);
-            AddProperty(nameof(IAssetEntity.CreatedBy), EdmPrimitiveTypeKind.String);
-            AddProperty(nameof(IAssetEntity.LastModified), EdmPrimitiveTypeKind.DateTimeOffset);
-            AddProperty(nameof(IAssetEntity.LastModifiedBy), EdmPrimitiveTypeKind.String);
-            AddProperty(nameof(IAssetEntity.Version), EdmPrimitiveTypeKind.Int64);
-            AddProperty(nameof(IAssetEntity.FileName), EdmPrimitiveTypeKind.String);
-            AddProperty(nameof(IAssetEntity.FileHash), EdmPrimitiveTypeKind.String);
-            AddProperty(nameof(IAssetEntity.FileSize), EdmPrimitiveTypeKind.Int64);
-            AddProperty(nameof(IAssetEntity.FileVersion), EdmPrimitiveTypeKind.Int64);
-            AddProperty(nameof(IAssetEntity.IsImage), EdmPrimitiveTypeKind.Boolean);
-            AddProperty(nameof(IAssetEntity.MimeType), EdmPrimitiveTypeKind.String);
-            AddProperty(nameof(IAssetEntity.PixelHeight), EdmPrimitiveTypeKind.Int32);
-            AddProperty(nameof(IAssetEntity.PixelWidth), EdmPrimitiveTypeKind.Int32);
-            AddProperty(nameof(IAssetEntity.Slug), EdmPrimitiveTypeKind.String);
-            AddProperty(nameof(IAssetEntity.Tags), EdmPrimitiveTypeKind.String);
-
-            var container = new EdmEntityContainer("Squidex", "Container");
-
-            container.AddEntitySet("AssetSet", entityType);
-
-            var model = new EdmModel();
-
-            model.AddElement(container);
-            model.AddElement(entityType);
-
-            Edm = model;
-        }
-    }
-}

src/Squidex.Domain.Apps.Events/Apps/AppLanguageUpdated.cs

@@ -7,6 +7,7 @@
 
 using System.Collections.Generic;
 using Squidex.Infrastructure;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Domain.Apps.Events.Apps
 {

src/Squidex.Domain.Apps.Events/Assets/AssetUpdated.cs

@@ -5,7 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Squidex.Infrastructure;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Domain.Apps.Events.Assets
 {

src/Squidex.Infrastructure/EventSourcing/EventTypeAttribute.cs

@@ -6,6 +6,7 @@
 // ==========================================================================
 
 using System;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Infrastructure.EventSourcing
 {

src/Squidex.Infrastructure/EventSourcing/NoopEvent.cs

@@ -5,6 +5,8 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using Squidex.Infrastructure.Reflection;
+
 namespace Squidex.Infrastructure.EventSourcing
 {
     [TypeName(nameof(NoopEvent))]

src/Squidex.Infrastructure/TypeNameAttribute.cs → src/Squidex.Infrastructure/Reflection/TypeNameAttribute.cs

@@ -7,7 +7,7 @@
 
 using System;
 
-namespace Squidex.Infrastructure
+namespace Squidex.Infrastructure.Reflection
 {
     [AttributeUsage(AttributeTargets.Class, Inherited = false)]
     public class TypeNameAttribute : Attribute

src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs

@@ -150,7 +150,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
 
         private ClientsDto GetResponse(IAppEntity app)
         {
-            return ClientsDto.FromApp(App, this);
+            return ClientsDto.FromApp(app, this);
         }
     }
 }

src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs

@@ -63,15 +63,15 @@ namespace Squidex.Areas.Api.Controllers.Contents
         [ApiCosts(2)]
         public async Task<IActionResult> PostGraphQL(string app, [FromBody] GraphQLQuery query)
         {
-            var result = await graphQl.QueryAsync(Context, query);
+            var (hasError, response) = await graphQl.QueryAsync(Context, query);
 
-            if (result.HasError)
+            if (hasError)
             {
-                return BadRequest(result.Response);
+                return BadRequest(response);
             }
             else
             {
-                return Ok(result.Response);
+                return Ok(response);
             }
         }
 
@@ -94,15 +94,15 @@ namespace Squidex.Areas.Api.Controllers.Contents
         [ApiCosts(2)]
         public async Task<IActionResult> PostGraphQLBatch(string app, [FromBody] GraphQLQuery[] batch)
         {
-            var result = await graphQl.QueryAsync(Context, batch);
+            var (hasError, response) = await graphQl.QueryAsync(Context, batch);
 
-            if (result.HasError)
+            if (hasError)
             {
-                return BadRequest(result.Response);
+                return BadRequest(response);
             }
             else
             {
-                return Ok(result.Response);
+                return Ok(response);
             }
         }
 
@@ -281,7 +281,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
 
             var command = new CreateContent { ContentId = Guid.NewGuid(), Data = request.ToCleaned(), Publish = publish };
 
-            var response = await InvokeCommandAsync(app, name, command);
+            var response = await InvokeCommandAsync(command);
 
             return CreatedAtAction(nameof(GetContent), new { app, id = command.ContentId }, response);
         }
@@ -313,7 +313,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
 
             var command = new UpdateContent { ContentId = id, Data = request.ToCleaned(), AsDraft = asDraft };
 
-            var response = await InvokeCommandAsync(app, name, command);
+            var response = await InvokeCommandAsync(command);
 
             return Ok(response);
         }
@@ -345,7 +345,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
 
             var command = new PatchContent { ContentId = id, Data = request.ToCleaned(), AsDraft = asDraft };
 
-            var response = await InvokeCommandAsync(app, name, command);
+            var response = await InvokeCommandAsync(command);
 
             return Ok(response);
         }
@@ -376,7 +376,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
 
             var command = request.ToCommand(id);
 
-            var response = await InvokeCommandAsync(app, name, command);
+            var response = await InvokeCommandAsync(command);
 
             return Ok(response);
         }
@@ -406,7 +406,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
 
             var command = new DiscardChanges { ContentId = id };
 
-            var response = await InvokeCommandAsync(app, name, command);
+            var response = await InvokeCommandAsync(command);
 
             return Ok(response);
         }
@@ -439,7 +439,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
             return NoContent();
         }
 
-        private async Task<ContentDto> InvokeCommandAsync(string app, string schema, ICommand command)
+        private async Task<ContentDto> InvokeCommandAsync(ICommand command)
         {
             var context = await CommandBus.PublishAsync(command);
 

src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs

@@ -46,16 +46,16 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models
                         Type = JsonObjectType.String, IsRequired = true
                     };
 
-                    foreach (var action in ruleRegistry.Actions)
+                    foreach (var (key, value) in ruleRegistry.Actions)
                     {
-                        var derivedSchema = context.SchemaGenerator.Generate<JsonSchema>(action.Value.Type.ToContextualType(), context.SchemaResolver);
+                        var derivedSchema = context.SchemaGenerator.Generate<JsonSchema>(value.Type.ToContextualType(), context.SchemaResolver);
 
                         var oldName = context.Document.Definitions.FirstOrDefault(x => x.Value == derivedSchema).Key;
 
                         if (oldName != null)
                         {
                             context.Document.Definitions.Remove(oldName);
-                            context.Document.Definitions.Add($"{action.Key}RuleActionDto", derivedSchema);
+                            context.Document.Definitions.Add($"{key}RuleActionDto", derivedSchema);
                         }
                     }
 

src/Squidex/Config/Domain/EntitiesServices.cs

@@ -170,12 +170,12 @@ namespace Squidex.Config.Domain
 
                 var result = new InitialPatterns();
 
-                foreach (var pattern in uiOptions.Value.RegexSuggestions)
+                foreach (var (key, value) in uiOptions.Value.RegexSuggestions)
                 {
-                    if (!string.IsNullOrWhiteSpace(pattern.Key) &&
-                        !string.IsNullOrWhiteSpace(pattern.Value))
+                    if (!string.IsNullOrWhiteSpace(key) &&
+                        !string.IsNullOrWhiteSpace(value))
                     {
-                        result[Guid.NewGuid()] = new AppPattern(pattern.Key, pattern.Value);
+                        result[Guid.NewGuid()] = new AppPattern(key, value);
                     }
                 }
 

tests/Squidex.Domain.Apps.Core.Tests/Model/Rules/RuleTests.cs

@@ -11,8 +11,8 @@ using System.Linq;
 using FluentAssertions;
 using Squidex.Domain.Apps.Core.Rules;
 using Squidex.Domain.Apps.Core.Rules.Triggers;
-using Squidex.Infrastructure;
 using Squidex.Infrastructure.Migrations;
+using Squidex.Infrastructure.Reflection;
 using Xunit;
 
 #pragma warning disable SA1310 // Field names must not contain underscore

tests/Squidex.Domain.Apps.Core.Tests/Operations/GenerateJsonSchema/JsonSchemaTests.cs

@@ -73,11 +73,11 @@ namespace Squidex.Domain.Apps.Core.Operations.GenerateJsonSchema
                 {
                     if (current.Properties != null)
                     {
-                        foreach (var property in current.Properties)
+                        foreach (var (key, value) in current.Properties)
                         {
-                            result.Add(property.Key);
+                            result.Add(key);
 
-                            AddProperties(property.Value);
+                            AddProperties(value);
                         }
                     }
 

tests/Squidex.Infrastructure.Tests/TypeNameAttributeTests.cs

@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using Squidex.Infrastructure.Reflection;
 using Xunit;
 
 namespace Squidex.Infrastructure

tools/Migrate_01/OldEvents/AppPlanChanged.cs

@@ -8,7 +8,6 @@
 using System;
 using Squidex.Domain.Apps.Events;
 using Squidex.Domain.Apps.Events.Apps;
-using Squidex.Infrastructure;
 using Squidex.Infrastructure.EventSourcing;
 using Squidex.Infrastructure.Migrations;
 using Squidex.Infrastructure.Reflection;

tools/Migrate_01/OldTriggers/AssetChangedTrigger.cs

@@ -10,8 +10,8 @@ using System.Collections.Generic;
 using Squidex.Domain.Apps.Core.HandleRules.EnrichedEvents;
 using Squidex.Domain.Apps.Core.Rules;
 using Squidex.Domain.Apps.Core.Rules.Triggers;
-using Squidex.Infrastructure;
 using Squidex.Infrastructure.Migrations;
+using Squidex.Infrastructure.Reflection;
 
 namespace Migrate_01.OldTriggers
 {

tools/Migrate_01/OldTriggers/ContentChangedTrigger.cs

@@ -10,8 +10,8 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Squidex.Domain.Apps.Core.Rules;
 using Squidex.Domain.Apps.Core.Rules.Triggers;
-using Squidex.Infrastructure;
 using Squidex.Infrastructure.Migrations;
+using Squidex.Infrastructure.Reflection;
 
 namespace Migrate_01.OldTriggers
 {