Added ComponentField + Refactoring

usercode · Dec 27, 2022 · e007e07 · e007e07
1 parent 5487fd2
commit e007e07
Show file tree

Hide file tree

Showing 232 changed files with 1,085 additions and 621 deletions.
diff --git a/src/DragonFly.API.Client/ClientContentService .Asset.cs b/src/DragonFly.API.Client/ClientContentService .Asset.cs
@@ -7,7 +7,6 @@
 using DragonFly.Data.Models;
 using System.Net.Http.Json;
 using System.Net.Http.Headers;
-using DragonFly.Storage;
 using DragonFly.Assets.Query;
 
 namespace DragonFly.Client;

diff --git a/src/DragonFly.API.Client/ClientContentService.AssetFolder.cs b/src/DragonFly.API.Client/ClientContentService.AssetFolder.cs
@@ -6,7 +6,6 @@
 using DragonFly.Assets.Query;
 using DragonFly.Data.Models;
 using System.Net.Http.Json;
-using DragonFly.Storage;
 
 namespace DragonFly.Client;
 

diff --git a/src/DragonFly.API.Client/ClientContentService.ContentItem.cs b/src/DragonFly.API.Client/ClientContentService.ContentItem.cs
@@ -6,7 +6,6 @@
 using DragonFly.Data.Models;
 using DragonFly.Models;
 using System.Net.Http.Json;
-using DragonFly.Storage;
 using DragonFly.AspNetCore.API.Exports.Json;
 using DragonFly.Query;
 

diff --git a/src/DragonFly.API.Client/ClientContentService.cs b/src/DragonFly.API.Client/ClientContentService.cs
@@ -7,7 +7,7 @@ namespace DragonFly.Client;
 /// <summary>
 /// ContentService
 /// </summary>
-public partial class ClientContentService
+public partial class ClientContentService : IDataStorage
 {
     public ClientContentService(HttpClient httpClient)
     {

diff --git a/src/DragonFly.API.Client/DragonFlyBuilderExtensions.cs b/src/DragonFly.API.Client/DragonFlyBuilderExtensions.cs
@@ -2,10 +2,9 @@
 // https://github.com/usercode/DragonFly
 // MIT License
 
+using DragonFly.API.Json;
 using DragonFly.Builders;
-using DragonFly.API.Exports.Json;
 using DragonFly.Core.ContentStructures;
-using DragonFly.Storage;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DragonFly.Client;
@@ -15,13 +14,15 @@ public static class StartupExtensions
     public static IDragonFlyBuilder AddRestApi(this IDragonFlyBuilder builder)
     {
         builder.Services.AddTransient<ClientContentService>();
+        builder.Services.AddTransient<IDataStorage, ClientContentService>();
         builder.Services.AddTransient<IContentStorage, ClientContentService>();
         builder.Services.AddTransient<IStructureStorage, ClientContentService>();
         builder.Services.AddTransient<IWebHookStorage, ClientContentService>();
         builder.Services.AddTransient<IAssetStorage, ClientContentService>();
         builder.Services.AddTransient<IAssetFolderStorage, ClientContentService>();
 
-        builder.PostInit<JsonDerivedTypesAction>();
+        builder.Init(api => api.JsonField().AddDefaults());
+        builder.PostInit<CreateMissingJsonFieldSerializer>();
 
         return builder;
     }

diff --git a/src/DragonFly.API.Exports/Assets/RestAsset.cs b/src/DragonFly.API.Exports/Assets/RestAsset.cs
@@ -14,7 +14,7 @@ public class RestAsset : RestContentBase
 {
     public RestAsset()
     {
-        _metaddata = new Dictionary<string, JsonNode>();
+        _metaddata = new JsonObject();
     }
 
     /// <summary>
@@ -62,10 +62,10 @@ public RestAsset()
     /// </summary>
     public virtual RestAssetFolder Folder { get; set; }
 
-    private IDictionary<string, JsonNode> _metaddata;
+    private JsonObject _metaddata;
 
     /// <summary>
     /// Metaddata
     /// </summary>
-    public virtual IDictionary<string, JsonNode> Metaddata { get => _metaddata; set => _metaddata = value; }
+    public virtual JsonObject Metaddata { get => _metaddata; set => _metaddata = value; }
 }
diff --git a/src/DragonFly.API.Exports/Assets/RestAssetConverter.cs b/src/DragonFly.API.Exports/Assets/RestAssetConverter.cs
@@ -65,7 +65,7 @@ public static RestAsset ToRest(this Asset asset)
             restAsset.Folder = asset.Folder.ToRest();
         }
 
-        foreach(var metadata in asset.Metaddata)
+        foreach (var metadata in asset.Metaddata)
         {
             restAsset.Metaddata.Add(metadata.Key, JsonSerializer.SerializeToNode(metadata.Value, metadata.Value.GetType()));
         }

diff --git a/src/DragonFly.API.Exports/ContentItems/RestContentComponent.cs b/src/DragonFly.API.Exports/ContentItems/RestContentComponent.cs
@@ -0,0 +1,38 @@
+// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using DragonFly.Contents.Content;
+
+namespace DragonFly.Models;
+
+/// <summary>
+/// RestContentComponent
+/// </summary>
+public class RestContentComponent
+{
+    public RestContentComponent()
+    {
+        Fields = new JsonObject();
+    }
+
+    /// <summary>
+    /// Schema
+    /// </summary>
+    [JsonPropertyOrder(3)]
+    public JsonNode? Schema { get; set; }
+
+    /// <summary>
+    /// SchemaVersion
+    /// </summary>
+    [JsonPropertyOrder(2)]
+    public int SchemaVersion { get; set; }
+
+    /// <summary>
+    /// Fields
+    /// </summary>
+    [JsonPropertyOrder(30)]
+    public JsonObject Fields { get; set; }
+}
diff --git a/src/DragonFly.API.Exports/ContentItems/RestContentEmbedded.cs b/src/DragonFly.API.Exports/ContentItems/RestContentEmbedded.cs
diff --git a/src/DragonFly.API.Exports/ContentItems/RestContentFields.cs b/src/DragonFly.API.Exports/ContentItems/RestContentFields.cs
diff --git a/src/DragonFly.API.Exports/ContentItems/RestContentItem.cs b/src/DragonFly.API.Exports/ContentItems/RestContentItem.cs
@@ -4,8 +4,8 @@
 
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using DragonFly.Content;
 using DragonFly.Contents.Content;
+
 namespace DragonFly.Models;
 
 /// <summary>
@@ -15,7 +15,7 @@ public class RestContentItem : RestContentBase
 {
     public RestContentItem()
     {
-        Fields = new RestContentFields();
+        Fields = new JsonObject();
     }
 
     /// <summary>
@@ -34,5 +34,5 @@ public RestContentItem()
     /// Fields
     /// </summary>
     [JsonPropertyOrder(30)]
-    public RestContentFields Fields { get; set; }
+    public JsonObject Fields { get; set; }
 }
diff --git a/src/DragonFly.API.Exports/ContentItems/RestContentItemConverter.cs b/src/DragonFly.API.Exports/ContentItems/RestContentItemConverter.cs
@@ -2,6 +2,7 @@
 // https://github.com/usercode/DragonFly
 // MIT License
 
+using DragonFly.AspNetCore.API.Exports.Json;
 using DragonFly.AspNetCore.API.Models;
 using DragonFly.Models;
 using System.Text.Json;
@@ -13,28 +14,22 @@ public static class RestContentItemConverter
 {
     public static ContentItem ToModel(this RestContentItem restContentItem)
     {
-        return ToModel(restContentItem, null);
-    }
-
-    public static ContentItem ToModel(this RestContentItem restContentItem, ContentSchema? schema)
-    {
-        if (schema == null)
+        ContentSchema schema;
+
+        if (restContentItem.Schema is JsonValue jsonValue)
         {
-            if (restContentItem.Schema is JsonValue jsonValue)
+            schema = new ContentSchema(jsonValue.GetValue<string>());
+        }
+        else
+        {
+            RestContentSchema? restSchema = restContentItem.Schema.Deserialize<RestContentSchema>(JsonSerializerDefault.Options);
+
+            if (restSchema == null)
             {
-                schema = new ContentSchema(jsonValue.GetValue<string>());
+                throw new Exception("Unknown schema");
             }
-            else
-            {
-                RestContentSchema? restSchema = restContentItem.Schema.Deserialize<RestContentSchema>();
-
-                if (restSchema == null)
-                {
-                    throw new Exception("Unknown schema");
-                }
 
-                schema = restSchema.ToModel();
-            }
+            schema = restSchema.ToModel();
         }
 
         ContentItem contentItem = schema.CreateContent();
@@ -54,11 +49,27 @@ public static ContentItem ToModel(this RestContentItem restContentItem, ContentS
         return contentItem;
     }
 
-    public static ContentEmbedded ToModel(this RestContentEmbedded restContentItem)
+    public static ContentComponent ToModel(this RestContentComponent restContentItem)
     {
-        ContentSchema schema = restContentItem.Schema.ToModel();
+        ContentSchema? schema;
 
-        ContentEmbedded contentItem = schema.CreateEmbeddedContent();
+        if (restContentItem.Schema is JsonValue jsonValue)
+        {
+            schema = new ContentSchema(jsonValue.GetValue<string>());
+        }
+        else
+        {
+            RestContentSchema? restSchema = restContentItem.Schema.Deserialize<RestContentSchema>(JsonSerializerDefault.Options);
+
+            if (restSchema == null)
+            {
+                throw new Exception("Unknown schema");
+            }
+
+            schema = restSchema.ToModel();
+        }
+
+        ContentComponent contentItem = schema.CreateEmbeddedContent();
 
         foreach (var restField in restContentItem.Fields)
         {
@@ -73,14 +84,16 @@ public static RestContentItem ToRest(this ContentItem contentItem, bool includeS
         RestContentItem restContentItem = new RestContentItem();
 
         restContentItem.Id = contentItem.Id;
+
         if (includeSchema)
         {
-            restContentItem.Schema = JsonSerializer.SerializeToNode(contentItem.Schema.ToRest());
+            restContentItem.Schema = JsonSerializer.SerializeToNode(contentItem.Schema.ToRest(), JsonSerializerDefault.Options);
         }
         else
         {
             restContentItem.Schema = JsonValue.Create(contentItem.Schema.Name);
         }
+
         restContentItem.CreatedAt = contentItem.CreatedAt;
         restContentItem.ModifiedAt = contentItem.ModifiedAt;
         restContentItem.PublishedAt = contentItem.PublishedAt;
@@ -91,23 +104,33 @@ public static RestContentItem ToRest(this ContentItem contentItem, bool includeS
         {
             JsonNode? node = field.Value.ToRestValue(includeNavigationProperties);
 
-            if (node != null)
-            {
+            //if (node != null)
+            //{
                 restContentItem.Fields.Add(field.Key, node);
-            }
+            //}
         }
 
         return restContentItem;
     }
 
-    public static RestContentItem ToRest(this ContentEmbedded contentItem)
+    public static RestContentComponent ToRest(this ContentComponent contentItem, bool includeSchema, bool includeNavigationProperties)
     {
-        RestContentItem restContentItem = new RestContentItem();
-        restContentItem.Schema = JsonSerializer.SerializeToNode(contentItem.Schema.ToRest());
+        RestContentComponent restContentItem = new RestContentComponent();
+
+        if (includeSchema)
+        {
+            restContentItem.Schema = JsonSerializer.SerializeToNode(contentItem.Schema.ToRest(), JsonSerializerDefault.Options);
+        }
+        else
+        {
+            restContentItem.Schema = JsonValue.Create(contentItem.Schema.Name);
+        }
 
         foreach (var field in contentItem.Fields)
         {
-            restContentItem.Fields.Add(field.Key, field.Value.ToRestValue());
+            JsonNode? node = field.Value.ToRestValue(includeNavigationProperties);
+
+            restContentItem.Fields[field.Key] = node;
         }
 
         return restContentItem;