New Content Action to define how a content item should be processed.

Squidex · Jun 14, 2022 · 624a147 · 624a147
1 parent 882e598
commit 624a147
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 7 deletions.
diff --git a/cli/Squidex.CLI/Directory.Build.props b/cli/Squidex.CLI/Directory.Build.props
@@ -8,6 +8,6 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Squidex/squidex/</PackageProjectUrl>
     <PackageTags>Squidex HeadlessCMS</PackageTags>
-    <Version>8.17</Version>
+    <Version>8.18</Version>
   </PropertyGroup>
 </Project>
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/ContentAction.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/ContentAction.cs
@@ -0,0 +1,18 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+namespace Squidex.CLI.Commands.Implementation.Sync
+{
+    public enum ContentAction
+    {
+        Upsert,
+        UpsertPatch,
+        Create,
+        Update,
+        Patch
+    }
+}
diff --git a/...quidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Contents/ContentsSynchronizer.cs b/...quidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Contents/ContentsSynchronizer.cs
@@ -131,7 +131,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
                         DoNotScript = true,
                         DoNotValidate = false,
                         DoNotValidateWorkflow = true,
-                        Jobs = model.Contents.Select(x => x.ToUpsert(schemas, options.PatchContent)).ToList()
+                        Jobs = model.Contents.Select(x => x.ToUpsert(schemas, options.ContentAction)).ToList()
                     };
 
                     var contentIdAssigned = false;

diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Contents/Extensions.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Contents/Extensions.cs
@@ -14,9 +14,9 @@ namespace Squidex.CLI.Commands.Implementation.Sync.Contents
 {
     public static class Extensions
     {
-        public static BulkUpdateJob ToUpsert(this ContentModel model, SchemasDto schemas, bool patch)
+        public static BulkUpdateJob ToUpsert(this ContentModel model, SchemasDto schemas, ContentAction action)
         {
-            var result = SimpleMapper.Map(model, new BulkUpdateJob { Patch = patch });
+            var result = SimpleMapper.Map(model, new BulkUpdateJob());
 
 #pragma warning disable CS0618 // Type or member is obsolete
             var singleton = schemas.Items.Find(x => x.Name == model.Schema && (x.IsSingleton || x.Type == SchemaType.Singleton));
@@ -26,6 +26,22 @@ public static BulkUpdateJob ToUpsert(this ContentModel model, SchemasDto schemas
                 result.Id = singleton.Id;
             }
 
+            switch (action)
+            {
+                case ContentAction.UpsertPatch:
+                    result.Patch = true;
+                    break;
+                case ContentAction.Create:
+                    result.Type = BulkUpdateType.Create;
+                    break;
+                case ContentAction.Update:
+                    result.Type = BulkUpdateType.Update;
+                    break;
+                case ContentAction.Patch:
+                    result.Type = BulkUpdateType.Patch;
+                    break;
+            }
+
             result.Data = model.Data;
 
             return result;

diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/SyncOptions.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/SyncOptions.cs
@@ -13,12 +13,12 @@ public sealed class SyncOptions
 
         public string[] Languages { get; set; }
 
+        public ContentAction ContentAction { get; set; }
+
         public bool Delete { get; set; }
 
         public bool Recreate { get; set; }
 
-        public bool PatchContent { get; set; }
-
         public bool UpdateCurrentClient { get; set; }
     }
 }
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Sync.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Sync.cs
@@ -111,6 +111,9 @@ public sealed class InArguments : AppArguments
                 [Option("language", Description = "The content language to synchronize.")]
                 public string[] Languages { get; set; }
 
+                [Option("content-action", Description = "Defines how to handle content.")]
+                public ContentAction ContentAction { get; set; }
+
                 [Option("delete", Description = "Use this flag to also delete entities.")]
                 public bool Delete { get; set; }
 
@@ -131,7 +134,14 @@ public sealed class InArguments : AppArguments
 
                 public SyncOptions ToOptions()
                 {
-                    return SimpleMapper.Map(this, new SyncOptions());
+                    var result = SimpleMapper.Map(this, new SyncOptions());
+
+                    if (PatchContent)
+                    {
+                        result.ContentAction = ContentAction.UpsertPatch;
+                    }
+
+                    return result;
                 }
 
                 public sealed class Validator : AbstractValidator<InArguments>