Browse Source

Remove the plan reset thing all together.

pull/470/head
Sebastian 7 years ago
parent
commit
816e3d56b7
  1. 34
      backend/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs
  2. 2
      backend/src/Squidex.Domain.Apps.Entities/Apps/Services/Implementations/NoopAppPlanBillingManager.cs
  3. 13
      backend/src/Squidex.Domain.Apps.Entities/Apps/Services/PlanResetResult.cs
  4. 4
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppGrainTests.cs

34
backend/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs

@ -276,14 +276,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
if (c.FromCallback)
{
if (string.Equals(appPlansProvider.GetFreePlan()?.Id, c.PlanId))
{
ResetPlan(c);
}
else
{
ChangePlan(c);
}
ChangePlan(c);
return null;
}
@ -296,9 +289,6 @@ namespace Squidex.Domain.Apps.Entities.Apps
case PlanChangedResult _:
ChangePlan(c);
break;
case PlanResetResult _:
ResetPlan(c);
break;
}
return result;
@ -361,6 +351,18 @@ namespace Squidex.Domain.Apps.Entities.Apps
}
}
public void ChangePlan(ChangePlan command)
{
if (string.Equals(appPlansProvider.GetFreePlan()?.Id, command.PlanId))
{
RaiseEvent(SimpleMapper.Map(command, new AppPlanReset()));
}
else
{
RaiseEvent(SimpleMapper.Map(command, new AppPlanChanged()));
}
}
public void Update(UpdateApp command)
{
RaiseEvent(SimpleMapper.Map(command, new AppUpdated()));
@ -426,16 +428,6 @@ namespace Squidex.Domain.Apps.Entities.Apps
RaiseEvent(SimpleMapper.Map(command, new AppLanguageRemoved()));
}
public void ChangePlan(ChangePlan command)
{
RaiseEvent(SimpleMapper.Map(command, new AppPlanChanged()));
}
public void ResetPlan(ChangePlan command)
{
RaiseEvent(SimpleMapper.Map(command, new AppPlanReset()));
}
public void AddPattern(AddPattern command)
{
RaiseEvent(SimpleMapper.Map(command, new AppPatternAdded()));

2
backend/src/Squidex.Domain.Apps.Entities/Apps/Services/Implementations/NoopAppPlanBillingManager.cs

@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Services.Implementations
public Task<IChangePlanResult> ChangePlanAsync(string userId, NamedId<Guid> appId, string? planId)
{
return Task.FromResult<IChangePlanResult>(new PlanResetResult());
return Task.FromResult<IChangePlanResult>(new PlanChangedResult());
}
public Task<string> GetPortalLinkAsync(string userId)

13
backend/src/Squidex.Domain.Apps.Entities/Apps/Services/PlanResetResult.cs

@ -1,13 +0,0 @@
// ==========================================================================
// Squidex Headless CMS
// ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschraenkt)
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
namespace Squidex.Domain.Apps.Entities.Apps.Services
{
public sealed class PlanResetResult : IChangePlanResult
{
}
}

4
backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppGrainTests.cs

@ -245,14 +245,14 @@ namespace Squidex.Domain.Apps.Entities.Apps
.Returns(new PlanChangedResult());
A.CallTo(() => appPlansBillingManager.ChangePlanAsync(Actor.Identifier, AppNamedId, planIdFree))
.Returns(new PlanResetResult());
.Returns(new PlanChangedResult());
await ExecuteCreateAsync();
await ExecuteChangePlanAsync();
var result = await PublishIdempotentAsync(command);
Assert.True(result is PlanResetResult);
Assert.True(result is PlanChangedResult);
Assert.Null(sut.Snapshot.Plan);

Loading…
Cancel
Save