Merge pull request #2 from episerver/bugfix/fix-several-content-types-issue

Fix issue where it was not possible to have several content types con…

Author: jonasbergqvist

Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/JsonConverters/SourceSdkContentConverter.cs

@@ -45,7 +45,14 @@ void WriteContent(Utf8JsonWriter writer, object value, JsonSerializerOptions opt
             writer.WriteString("Status$$String", "Published");
             writer.WriteString("__typename", contentType.Name);
             writer.WriteString("_rbac", "r:Everyone:Read");
-            writer.WriteString("ContentType$$String", contentType.Name);
+
+            writer.WriteStartArray("ContentType$$String");
+            writer.WriteStringValue(contentType.Name);
+            foreach (var type in contentType.GetInterfaces())
+            {
+                writer.WriteStringValue(type.Name);
+            }
+            writer.WriteEndArray();
 
             writer.WriteStartObject("Language");
             writer.WriteString("Name$$String", "en"); //TODO: Set Language

Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/JsonConverters/SourceSdkContentTypeConverter.cs

@@ -15,19 +15,22 @@ public override void Write(Utf8JsonWriter writer, IEnumerable<TypeFieldConfigura
         {
             writer.WriteStartObject();
 
-            foreach(var contentTypeFieldConfiguration in value.Where(x => x.ConfigurationType == ConfigurationType.ContentType))
+            writer.WriteBoolean("useTypedFieldNames", true);
+            writer.WriteString("label", "AlloyExternalData");
+
+            writer.WriteStartArray("languages");
+            foreach (var language in SourceConfigurationModel.GetLanguages())
             {
-                writer.WriteBoolean("useTypedFieldNames", true);
-                writer.WriteString("label", contentTypeFieldConfiguration.TypeName);
+                writer.WriteStringValue(language);
+            }
+            writer.WriteEndArray();
 
-                writer.WriteStartArray("languages");
-                foreach (var language in SourceConfigurationModel.GetLanguages())
-                {
-                    writer.WriteStringValue(language);
-                }
-                writer.WriteEndArray();
+            writer.WriteStartObject("contentTypes");
+            foreach (var contentTypeFieldConfiguration in value.Where(x => x.ConfigurationType == ConfigurationType.ContentType))
+            {
+                
+                
 
-                writer.WriteStartObject("contentTypes");
                 writer.WriteStartObject(contentTypeFieldConfiguration.TypeName);
 
                 writer.WriteStartArray("contentType");
@@ -52,8 +55,8 @@ public override void Write(Utf8JsonWriter writer, IEnumerable<TypeFieldConfigura
                 writer.WriteEndObject();
 
                 writer.WriteEndObject();
-                writer.WriteEndObject();
             }
+            writer.WriteEndObject();
 
             writer.WriteStartObject("propertyTypes");
             foreach (var contentTypeFieldConfiguration in value.Where(x => x.ConfigurationType == ConfigurationType.PropertyType))