diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs index 51c460837..c4f934b48 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Collections.Generic; using System.Threading.Tasks; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Apps.Guards; @@ -24,30 +25,34 @@ namespace Squidex.Domain.Apps.Entities.Apps private readonly IAppPlansProvider appPlansProvider; private readonly IAppPlanBillingManager appPlansBillingManager; private readonly IUserResolver userResolver; + private readonly IEnumerable templateBuilders; public AppCommandMiddleware( IAggregateHandler handler, IAppProvider appProvider, IAppPlansProvider appPlansProvider, IAppPlanBillingManager appPlansBillingManager, - IUserResolver userResolver) + IUserResolver userResolver, + IEnumerable templateBuilders) { Guard.NotNull(handler, nameof(handler)); Guard.NotNull(appProvider, nameof(appProvider)); Guard.NotNull(userResolver, nameof(userResolver)); Guard.NotNull(appPlansProvider, nameof(appPlansProvider)); Guard.NotNull(appPlansBillingManager, nameof(appPlansBillingManager)); + Guard.NotNull(templateBuilders, nameof(templateBuilders)); this.handler = handler; this.userResolver = userResolver; this.appProvider = appProvider; this.appPlansProvider = appPlansProvider; this.appPlansBillingManager = appPlansBillingManager; + this.templateBuilders = templateBuilders; } - protected Task On(CreateApp command, CommandContext context) + protected async Task On(CreateApp command, CommandContext context) { - return handler.CreateSyncedAsync(context, async a => + var app = await handler.CreateSyncedAsync(context, async a => { await GuardApp.CanCreate(command, appProvider); @@ -55,6 +60,14 @@ namespace Squidex.Domain.Apps.Entities.Apps context.Complete(EntityCreatedResult.Create(command.AppId, a.Version)); }); + + if (!string.IsNullOrWhiteSpace(command.Template)) + { + foreach (var templateBuilder in templateBuilders) + { + await templateBuilder.PopulateTemplate(app.Snapshot, command.Template, context.CommandBus); + } + } } protected Task On(AssignContributor command, CommandContext context) diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs index b49d54c59..5e8050247 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs @@ -16,6 +16,8 @@ namespace Squidex.Domain.Apps.Entities.Apps.Commands public string Name { get; set; } + public string Template { get; set; } + Guid IAggregateCommand.AggregateId { get { return AppId; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/IAppTemplateBuilder.cs b/src/Squidex.Domain.Apps.Entities/Apps/IAppTemplateBuilder.cs new file mode 100644 index 000000000..42b4b3439 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Apps/IAppTemplateBuilder.cs @@ -0,0 +1,17 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading.Tasks; +using Squidex.Infrastructure.Commands; + +namespace Squidex.Domain.Apps.Entities.Apps +{ + public interface IAppTemplateBuilder + { + Task PopulateTemplate(IAppEntity app, string name, ICommandBus bus); + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/Blog.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/Blog.cs new file mode 100644 index 000000000..79d9df9f3 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/Blog.cs @@ -0,0 +1,217 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Squidex.Domain.Apps.Core; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Domain.Apps.Entities.Apps.Commands; +using Squidex.Domain.Apps.Entities.Contents.Commands; +using Squidex.Domain.Apps.Entities.Schemas.Commands; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; + +namespace Squidex.Domain.Apps.Entities.Apps.Templates +{ + public sealed class Blog : IAppTemplateBuilder + { + private const string SlugScript = @" + var data = ctx.data; + + data.slug = { iv: slugify(data.title.iv) }; + + replace(data);"; + + public async Task PopulateTemplate(IAppEntity app, string name, ICommandBus bus) + { + if (string.Equals("Blog", name, StringComparison.OrdinalIgnoreCase)) + { + var appId = new NamedId(app.Id, app.Name); + + Task publishAsync(AppCommand command) + { + command.AppId = appId; + + return bus.PublishAsync(command); + } + + var pagesId = await CreatePagesSchema(publishAsync); + var postsId = await CreatePostsSchema(publishAsync); + + await publishAsync(new CreateContent + { + SchemaId = pagesId, + Data = + new NamedContentData() + .AddField("title", + new ContentFieldData() + .AddValue("iv", "About Me")) + .AddField("text", + new ContentFieldData() + .AddValue("iv", "I love Squidex and SciFi!")), + Publish = true + }); + + await publishAsync(new CreateContent + { + SchemaId = postsId, + Data = + new NamedContentData() + .AddField("title", + new ContentFieldData() + .AddValue("iv", "My first post with Squidex")) + .AddField("text", + new ContentFieldData() + .AddValue("iv", "Just created a blog with Squidex. I love it!")), + Publish = true, + }); + + await publishAsync(new AttachClient { Id = "sample-client" }); + } + } + + private async Task> CreatePostsSchema(Func publishAsync) + { + var command = new CreateSchema + { + Name = "posts", + Properties = new SchemaProperties + { + Label = "Posts" + }, + Fields = new List + { + new CreateSchemaField + { + Name = "title", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.Input, + IsRequired = true, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Title" + } + }, + new CreateSchemaField + { + Name = "slug", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.Slug, + IsRequired = false, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Slug" + } + }, + new CreateSchemaField + { + Name = "text", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.RichText, + IsRequired = true, + IsListField = false, + Label = "Text" + } + } + } + }; + + await publishAsync(command); + + var schemaId = new NamedId(command.SchemaId, command.Name); + + await publishAsync(new PublishSchema { SchemaId = schemaId }); + await publishAsync(new ConfigureScripts + { + SchemaId = schemaId, + ScriptCreate = SlugScript, + ScriptUpdate = SlugScript + }); + + return schemaId; + } + + private async Task> CreatePagesSchema(Func publishAsync) + { + var command = new CreateSchema + { + Name = "pages", + Properties = new SchemaProperties + { + Label = "Pages" + }, + Fields = new List + { + new CreateSchemaField + { + Name = "title", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.Input, + IsRequired = true, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Title" + } + }, + new CreateSchemaField + { + Name = "slug", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.Slug, + IsRequired = false, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Slug" + } + }, + new CreateSchemaField + { + Name = "text", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.RichText, + IsRequired = true, + IsListField = false, + Label = "Text" + } + } + } + }; + + await publishAsync(command); + + var schemaId = new NamedId(command.SchemaId, command.Name); + + await publishAsync(new PublishSchema { SchemaId = schemaId }); + await publishAsync(new ConfigureScripts + { + SchemaId = schemaId, + ScriptCreate = SlugScript, + ScriptUpdate = SlugScript + }); + + return schemaId; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs b/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs index 1837b977f..71e0a11e7 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs @@ -5,10 +5,17 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; + namespace Squidex.Domain.Apps.Entities.Contents.Commands { public sealed class CreateContent : ContentDataCommand { public bool Publish { get; set; } + + public CreateContent() + { + ContentId = Guid.NewGuid(); + } } } diff --git a/src/Squidex.Infrastructure/Commands/CommandContext.cs b/src/Squidex.Infrastructure/Commands/CommandContext.cs index 278c7eebf..a83ba04fb 100644 --- a/src/Squidex.Infrastructure/Commands/CommandContext.cs +++ b/src/Squidex.Infrastructure/Commands/CommandContext.cs @@ -12,6 +12,7 @@ namespace Squidex.Infrastructure.Commands public sealed class CommandContext { private readonly ICommand command; + private readonly ICommandBus commandBus; private readonly Guid contextId = Guid.NewGuid(); private Tuple result; @@ -20,6 +21,11 @@ namespace Squidex.Infrastructure.Commands get { return command; } } + public ICommandBus CommandBus + { + get { return commandBus; } + } + public Guid ContextId { get { return contextId; } @@ -30,11 +36,13 @@ namespace Squidex.Infrastructure.Commands get { return result != null; } } - public CommandContext(ICommand command) + public CommandContext(ICommand command, ICommandBus commandBus) { Guard.NotNull(command, nameof(command)); + Guard.NotNull(commandBus, nameof(commandBus)); this.command = command; + this.commandBus = commandBus; } public void Complete(object resultValue = null) diff --git a/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs b/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs index 498a41a28..13892b92e 100644 --- a/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs +++ b/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs @@ -28,7 +28,7 @@ namespace Squidex.Infrastructure.Commands { Guard.NotNull(command, nameof(command)); - var context = new CommandContext(command); + var context = new CommandContext(command, this); var next = new Func(() => TaskHelper.Done); diff --git a/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs index 362932862..92cab9c82 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs @@ -17,5 +17,10 @@ namespace Squidex.Areas.Api.Controllers.Apps.Models [Required] [RegularExpression("^[a-z0-9]+(\\-[a-z0-9]+)*$")] public string Name { get; set; } + + /// + /// Initialize the app with the inbuilt template. + /// + public string Template { get; set; } } } diff --git a/src/Squidex/Config/Domain/WriteServices.cs b/src/Squidex/Config/Domain/WriteServices.cs index 69bfce8c0..957d1c1da 100644 --- a/src/Squidex/Config/Domain/WriteServices.cs +++ b/src/Squidex/Config/Domain/WriteServices.cs @@ -12,6 +12,7 @@ using Migrate_01; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.Scripting; using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Domain.Apps.Entities.Apps.Templates; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Rules; @@ -75,6 +76,9 @@ namespace Squidex.Config.Domain services.AddTransientAs() .As(); + services.AddTransientAs() + .As(); + services.AddTransientAs() .AsSelf(); diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.html b/src/Squidex/app/features/apps/pages/apps-page.component.html index 36c34a5f2..cd36226d0 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.html +++ b/src/Squidex/app/features/apps/pages/apps-page.component.html @@ -1,17 +1,56 @@  -
-
+
+

Hi {{ctx.user.displayName}}

+ +
+ Welcome to Squidex. +
+
+ +
+

You are not collaborating to any app yet

+
- +
+
+

{{app.name}}

+ +
+ Edit +
+
+
-
-
-

{{app.name}}

+
+
+
+
+ +
- Edit +

New App

+ +
+ Create a new blank app without content and schemas. +
+
+
+ +
+
+
+ +
+ +

Blog Sample

+ +
+
Start with our ready to use blog.
+
Sample Code: ASP.NET Core
+
@@ -21,7 +60,8 @@
-

Create App

+

Create {{template}} Sample

+

Create App

- diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.scss b/src/Squidex/app/features/apps/pages/apps-page.component.scss index 19456fd7f..83a0b1efb 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.scss +++ b/src/Squidex/app/features/apps/pages/apps-page.component.scss @@ -2,14 +2,19 @@ @import '_mixins'; .apps { - @include clearfix; - padding: 1.25rem; - padding-left: $size-sidebar-width + .25rem; - display: block; -} + &-title { + font-weight: light; + font-size: 1.4rem; + } -h4 { - line-height: 2rem; + &-section { + @include clearfix; + padding-top: 2rem; + padding-right: 1.25rem; + padding-bottom: 0; + padding-left: $size-sidebar-width + .25rem; + display: block; + } } .app { @@ -26,7 +31,65 @@ h4 { } } -.empty-headline { - margin: 1.25rem; - margin-top: 6.25rem; +.card { + & { + margin-right: 1rem; + margin-bottom: 1rem; + width: 16rem; + float: left; + } + + &-lg { + width: 33rem; + } + + &-image { + text-align: center; + } + + &-text { + color: $color-text-decent; + font-weight: normal; + font-size: .9rem; + } + + &-more { + color: $color-text-decent; + font-weight: normal; + font-size: .8rem; + margin-top: .4rem; + } + + &-title { + color: $color-title; + font-weight: light; + font-size: 1.2rem; + margin-top: .4rem; + } + + &-template { + .card-body { + min-height: 15.5rem; + } + } + + &-href { + & { + cursor: pointer; + } + + &:hover { + @include box-shadow(0, 3px, 16px, .2px); + } + + &:focus { + outline: none; + } + + &:hover, + &:focus, + &:active { + text-decoration: none; + } + } } \ No newline at end of file diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.ts b/src/Squidex/app/features/apps/pages/apps-page.component.ts index 917aa9e89..69bc3f356 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.ts +++ b/src/Squidex/app/features/apps/pages/apps-page.component.ts @@ -9,6 +9,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { + AppContext, AppDto, AppsStoreService, fadeAnimation, @@ -20,6 +21,9 @@ import { selector: 'sqx-apps-page', styleUrls: ['./apps-page.component.scss'], templateUrl: './apps-page.component.html', + providers: [ + AppContext + ], animations: [ fadeAnimation ] @@ -30,9 +34,12 @@ export class AppsPageComponent implements OnDestroy, OnInit { public addAppDialog = new ModalView(); public apps: AppDto[]; + public template = ''; + public onboardingModal = new ModalView(); constructor( + public readonly ctx: AppContext, private readonly appsStore: AppsStoreService, private readonly onboardingService: OnboardingService ) { @@ -54,4 +61,10 @@ export class AppsPageComponent implements OnDestroy, OnInit { this.apps = apps; }); } + + public createNewApp(template: string) { + this.template = template; + + this.addAppDialog.show(); + } } \ No newline at end of file diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html index ca0427db4..b8f447f0f 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.html +++ b/src/Squidex/app/features/content/pages/content/content-field.component.html @@ -1,6 +1,6 @@
Disabled @@ -18,7 +18,7 @@
- +
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html index 757a1d9f0..440b41ef3 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html @@ -75,7 +75,7 @@ - {{field | sqxDisplayName:'properties.label':'name'}} + {{field.displayName}} Updated diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html index e49d84873..f030c7f5a 100644 --- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html @@ -25,7 +25,7 @@
diff --git a/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.html b/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.html index 8080fde1d..e2dec973b 100644 --- a/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.html +++ b/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.html @@ -35,7 +35,7 @@ - {{schema.schema.name}} + {{schema.schema.displayName}} @@ -64,7 +64,7 @@
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html index 122cbb80f..fe2756263 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html @@ -49,7 +49,7 @@

- {{schema | sqxDisplayName:'properties.label':'name'}} + {{schema.displayName}}

diff --git a/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.html b/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.html index 011526d3f..c6b8839ff 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.html @@ -4,7 +4,7 @@
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html index d6c3e2844..305cb764b 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html @@ -33,7 +33,7 @@
- {{schema | sqxDisplayName:'properties.label':'name'}} + {{schema.displayName}}
diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts index 9b27cad46..1984efe46 100644 --- a/src/Squidex/app/shared/components/app-form.component.ts +++ b/src/Squidex/app/shared/components/app-form.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, EventEmitter, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { ApiUrlConfig, ValidatorsEx } from 'framework'; @@ -30,6 +30,9 @@ export class AppFormComponent { @Output() public cancelled = new EventEmitter(); + @Input() + public template = ''; + public createFormError = ''; public createFormSubmitted = false; public createForm = @@ -64,7 +67,7 @@ export class AppFormComponent { if (this.createForm.valid) { this.createForm.disable(); - const request = new CreateAppDto(this.createForm.controls['name'].value); + const request = new CreateAppDto(this.createForm.controls['name'].value, this.template); this.appsStore.createApp(request) .subscribe(dto => { diff --git a/src/Squidex/app/shared/services/apps.service.ts b/src/Squidex/app/shared/services/apps.service.ts index fb9d83451..ed6f8f004 100644 --- a/src/Squidex/app/shared/services/apps.service.ts +++ b/src/Squidex/app/shared/services/apps.service.ts @@ -33,7 +33,8 @@ export class AppDto { export class CreateAppDto { constructor( - public readonly name: string + public readonly name: string, + public readonly template?: string ) { } } diff --git a/src/Squidex/app/shared/services/schemas.service.ts b/src/Squidex/app/shared/services/schemas.service.ts index 63fdd2f5a..a9964164e 100644 --- a/src/Squidex/app/shared/services/schemas.service.ts +++ b/src/Squidex/app/shared/services/schemas.service.ts @@ -17,6 +17,7 @@ import { ApiUrlConfig, DateTime, HTTP, + StringHelper, ValidatorsEx, Version, Versioned @@ -77,6 +78,10 @@ export function createProperties(fieldType: string, values: Object | null = null } export class SchemaDto { + public get displayName() { + return StringHelper.firstNonEmpty(this.properties.label || '', this.name); + } + constructor( public readonly id: string, public readonly name: string, @@ -274,6 +279,10 @@ export class SchemaDetailsDto extends SchemaDto { } export class FieldDto { + public get displayName() { + return StringHelper.firstNonEmpty(this.properties.label || '', this.name); + } + constructor( public readonly fieldId: number, public readonly name: string, diff --git a/src/Squidex/wwwroot/images/add-app.png b/src/Squidex/wwwroot/images/add-app.png index d445eda93..605f0a4c4 100644 Binary files a/src/Squidex/wwwroot/images/add-app.png and b/src/Squidex/wwwroot/images/add-app.png differ diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppCommandMiddlewareTests.cs index 42223eaaa..4b82b2a2e 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppCommandMiddlewareTests.cs @@ -25,6 +25,8 @@ namespace Squidex.Domain.Apps.Entities.Apps private readonly IAppPlansProvider appPlansProvider = A.Fake(); private readonly IAppPlanBillingManager appPlansBillingManager = A.Fake(); private readonly IUserResolver userResolver = A.Fake(); + private readonly IAppTemplateBuilder templateBuilder1 = A.Fake(); + private readonly IAppTemplateBuilder templateBuilder2 = A.Fake(); private readonly Language language = Language.DE; private readonly string contributorId = Guid.NewGuid().ToString(); private readonly string clientName = "client"; @@ -45,7 +47,13 @@ namespace Squidex.Domain.Apps.Entities.Apps A.CallTo(() => userResolver.FindByIdAsync(contributorId)) .Returns(A.Fake()); - sut = new AppCommandMiddleware(Handler, appProvider, appPlansProvider, appPlansBillingManager, userResolver); + var templateBuilders = new[] + { + templateBuilder1, + templateBuilder2 + }; + + sut = new AppCommandMiddleware(Handler, appProvider, appPlansProvider, appPlansBillingManager, userResolver, templateBuilders); } [Fact] @@ -59,6 +67,29 @@ namespace Squidex.Domain.Apps.Entities.Apps }); Assert.Equal(AppId, context.Result>().IdOrValue); + + A.CallTo(() => templateBuilder1.PopulateTemplate(A.Ignored, A.Ignored, context.CommandBus)) + .MustNotHaveHappened(); + A.CallTo(() => templateBuilder2.PopulateTemplate(A.Ignored, A.Ignored, context.CommandBus)) + .MustNotHaveHappened(); + } + + [Fact] + public async Task Create_should_call_template_builders_with_template_name() + { + var context = CreateContextForCommand(new CreateApp { Name = AppName, AppId = AppId, Template = "Blog" }); + + await TestCreate(app, async _ => + { + await sut.HandleAsync(context); + }); + + Assert.Equal(AppId, context.Result>().IdOrValue); + + A.CallTo(() => templateBuilder1.PopulateTemplate(A.Ignored, "Blog", context.CommandBus)) + .MustHaveHappened(); + A.CallTo(() => templateBuilder2.PopulateTemplate(A.Ignored, "Blog", context.CommandBus)) + .MustHaveHappened(); } [Fact] diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs index ffa2afe06..d92690828 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs @@ -22,7 +22,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { private readonly Guid contentId = Guid.NewGuid(); private readonly IContentEntity content; - private readonly CommandContext commandContext = new CommandContext(new PatchContent()); + private readonly CommandContext commandContext = new CommandContext(new PatchContent(), A.Dummy()); public GraphQLMutationTests() { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs index 231aa9d8d..73a745fde 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs @@ -98,7 +98,7 @@ namespace Squidex.Domain.Apps.Entities.TestHelpers protected CommandContext CreateContextForCommand(TCommand command) where TCommand : SquidexCommand { - return new CommandContext(CreateCommand(command)); + return new CommandContext(CreateCommand(command), A.Dummy()); } protected async Task TestCreate(T domainObject, Func action, bool shouldCreate = true) diff --git a/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs index e0f54127f..f1c9113d0 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs @@ -26,7 +26,7 @@ namespace Squidex.Infrastructure.Commands private readonly Envelope event1 = new Envelope(new MyEvent()); private readonly Envelope event2 = new Envelope(new MyEvent()); private readonly CommandContext context; - private readonly CommandContext invalidContext = new CommandContext(A.Dummy()); + private readonly CommandContext invalidContext = new CommandContext(A.Dummy(), A.Dummy()); private readonly Guid domainObjectId = Guid.NewGuid(); private readonly MyCommand command; private readonly MyDomainObject domainObject = new MyDomainObject(); @@ -35,7 +35,7 @@ namespace Squidex.Infrastructure.Commands public AggregateHandlerTests() { command = new MyCommand { AggregateId = domainObjectId, ExpectedVersion = EtagVersion.Any }; - context = new CommandContext(command); + context = new CommandContext(command, A.Dummy()); A.CallTo(() => store.WithSnapshotsAndEventSourcing(domainObjectId, A>.Ignored, A, Task>>.Ignored)) .Returns(persistence); diff --git a/tests/Squidex.Infrastructure.Tests/Commands/CommandContextTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/CommandContextTests.cs index 3163cacb9..3d97d2a33 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/CommandContextTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/CommandContextTests.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using FakeItEasy; using Squidex.Infrastructure.TestHelpers; using Xunit; @@ -18,7 +19,7 @@ namespace Squidex.Infrastructure.Commands public CommandContextTests() { - sut = new CommandContext(command); + sut = new CommandContext(command, A.Dummy()); } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/Commands/EnrichWithTimestampCommandMiddlewareTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/EnrichWithTimestampCommandMiddlewareTests.cs index 528b4bfcd..491f9e7d1 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/EnrichWithTimestampCommandMiddlewareTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/EnrichWithTimestampCommandMiddlewareTests.cs @@ -16,6 +16,7 @@ namespace Squidex.Infrastructure.Commands public class EnrichWithTimestampCommandMiddlewareTests { private readonly IClock clock = A.Fake(); + private readonly ICommandBus commandBus = A.Dummy(); [Fact] public async Task Should_set_timestamp_for_timestamp_command() @@ -28,7 +29,7 @@ namespace Squidex.Infrastructure.Commands var command = new MyCommand(); - await sut.HandleAsync(new CommandContext(command)); + await sut.HandleAsync(new CommandContext(command, commandBus)); Assert.Equal(utc, command.Timestamp); } @@ -38,7 +39,7 @@ namespace Squidex.Infrastructure.Commands { var sut = new EnrichWithTimestampCommandMiddleware(clock); - await sut.HandleAsync(new CommandContext(A.Dummy())); + await sut.HandleAsync(new CommandContext(A.Dummy(), commandBus)); A.CallTo(() => clock.GetCurrentInstant()).MustNotHaveHappened(); } diff --git a/tests/Squidex.Infrastructure.Tests/Commands/LogCommandMiddlewareTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/LogCommandMiddlewareTests.cs index 01415cc30..716aaf60f 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/LogCommandMiddlewareTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/LogCommandMiddlewareTests.cs @@ -20,6 +20,7 @@ namespace Squidex.Infrastructure.Commands private readonly MyLog log = new MyLog(); private readonly LogCommandMiddleware sut; private readonly ICommand command = A.Dummy(); + private readonly ICommandBus commandBus = A.Dummy(); private sealed class MyLog : ISemanticLog { @@ -47,7 +48,7 @@ namespace Squidex.Infrastructure.Commands [Fact] public async Task Should_log_before_and_after_request() { - var context = new CommandContext(command); + var context = new CommandContext(command, commandBus); await sut.HandleAsync(context, () => { @@ -63,7 +64,7 @@ namespace Squidex.Infrastructure.Commands [Fact] public async Task Should_log_error_if_command_failed() { - var context = new CommandContext(command); + var context = new CommandContext(command, commandBus); await Assert.ThrowsAsync(async () => { @@ -78,7 +79,7 @@ namespace Squidex.Infrastructure.Commands [Fact] public async Task Should_log_if_command_is_not_handled() { - var context = new CommandContext(command); + var context = new CommandContext(command, commandBus); await sut.HandleAsync(context, () => TaskHelper.Done);