From a4a240cc86ca27b096cd7511a942d6aeb4d5b770 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 29 Mar 2019 20:30:36 +0100 Subject: [PATCH] Minor refactoring. --- .../Contents/State/ContentState.cs | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs index 558a49e8c..7c83be899 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs @@ -60,27 +60,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.State } } - protected void On(ContentUpdateProposed @event) - { - DataDraft = @event.Data; - - IsPending = true; - } - - protected void On(ContentChangesDiscarded @event) - { - DataDraft = Data; - - IsPending = false; - } - protected void On(ContentChangesPublished @event) { ScheduleJob = null; - Data = DataDraft; - - IsPending = false; + UpdatePublished(); } protected void On(ContentStatusChanged @event) @@ -91,10 +75,18 @@ namespace Squidex.Domain.Apps.Entities.Contents.State if (@event.Status == Status.Published) { - Data = DataDraft; + UpdatePublished(); } + } - IsPending = false; + protected void On(ContentUpdateProposed @event) + { + UpdateDraft(@event.Data, true); + } + + protected void On(ContentChangesDiscarded @event) + { + UpdateDraft(Data, false); } protected void On(ContentSchedulingCancelled @event) @@ -118,5 +110,19 @@ namespace Squidex.Domain.Apps.Entities.Contents.State return Clone().Update(payload, @event.Headers, r => r.DispatchAction(payload)); } + + private void UpdateDraft(NamedContentData data, bool isPending) + { + DataDraft = data; + + IsPending = isPending; + } + + private void UpdatePublished() + { + Data = DataDraft; + + IsPending = false; + } } }