fix: add specific object into list message

src/Sinch/Conversation/Messages/Message/ListItemChoice.cs → src/Sinch/Conversation/Messages/Message/ChoiceItem.cs

@@ -5,7 +5,7 @@ namespace Sinch.Conversation.Messages.Message
     /// <summary>
     ///     A message component for interactive messages, containing a choice.
     /// </summary>
-    public class ListItemChoice : IListItem
+    public class ChoiceItem : IListItem
     {
         /// <summary>
         ///     Required parameter. Title for the choice item.

src/Sinch/Conversation/Messages/Message/ListMessage.cs

@@ -1,5 +1,8 @@
+using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using Sinch.Core;
 
 namespace Sinch.Conversation.Messages.Message
@@ -90,11 +93,66 @@ public override string ToString()
         }
     }
 
-    [JsonInterfaceConverter(typeof(InterfaceConverter<IListItem>))]
+    [JsonInterfaceConverter(typeof(ListItemJsonConverter))]
     public interface IListItem
     {
     }
 
+    public class ListItemJsonConverter : JsonConverter<IListItem>
+    {
+        public override IListItem? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var elem = JsonElement.ParseValue(ref reader);
+            if (elem.TryGetProperty("choice", out var choice))
+            {
+                return choice.Deserialize<ChoiceItem>(options);
+            }
+
+            if (elem.TryGetProperty("product", out var product))
+            {
+                return product.Deserialize<ProductItem>(options);
+            }
+
+            throw new JsonException(
+                $"Failed to match {nameof(IListItem)}, got json element: {elem.ToString()}");
+        }
+
+        public override void Write(Utf8JsonWriter writer, IListItem value, JsonSerializerOptions options)
+        {
+            var type = value.GetType();
+            if (type == typeof(ChoiceItem))
+            {
+                JsonSerializer.Serialize(writer, new ListItemChoiceWrapper()
+                {
+                    Choice = value as ChoiceItem
+                }, options);
+                return;
+            }
+
+            if (type == typeof(ProductItem))
+            {
+                JsonSerializer.Serialize(writer, new ListItemProductWrapper()
+                {
+                    Product = value as ProductItem
+                }, options);
+                return;
+            }
+
+            throw new InvalidOperationException(
+                $"Value is not in range of expected types - actual type is {type.FullName}");
+        }
+    }
+
+    internal class ListItemChoiceWrapper
+    {
+        public ChoiceItem? Choice { get; set; }
+    }
+
+    internal class ListItemProductWrapper
+    {
+        public ProductItem? Product { get; set; }
+    }
+
     /// <summary>
     ///     Additional properties for the message. Required if sending a product list message.
     /// </summary>

src/Sinch/Conversation/Messages/Message/ListItemProduct.cs → src/Sinch/Conversation/Messages/Message/ProductItem.cs

@@ -5,7 +5,7 @@ namespace Sinch.Conversation.Messages.Message
     /// <summary>
     ///     A message component for interactive messages, containing a product.
     /// </summary>
-    public sealed class ListItemProduct : IListItem
+    public sealed class ProductItem : IListItem
     {
         /// <summary>
         ///     Required parameter. The ID for the product.

tests/Sinch.Tests/Conversation/MessagesTests.cs

@@ -44,7 +44,7 @@ public async Task GetMessage()
                         Title = "sec1",
                         Items = new List<IListItem>()
                         {
-                            new ListItemChoice()
+                            new ChoiceItem()
                             {
                                 Title = "title",
                                 Description = "desc",
@@ -59,9 +59,9 @@ public async Task GetMessage()
                     new ListSection()
                     {
                         Title = "sec2",
-                        Items = new List<IListItem>()
+                        Items = new List<IListItem>
                         {
-                            new ListItemProduct()
+                            new ProductItem()
                             {
                                 Id = "id",
                                 Marketplace = "amazon"
@@ -207,13 +207,16 @@ private static object Message()
                                 {
                                     new
                                     {
-                                        title = "title",
-                                        description = "desc",
-                                        media = new
+                                        choice = new
                                         {
-                                            url = "http://localhost",
-                                        },
-                                        postback_data = "postback"
+                                            title = "title",
+                                            description = "desc",
+                                            media = new
+                                            {
+                                                url = "http://localhost",
+                                            },
+                                            postback_data = "postback"
+                                        }
                                     }
                                 }
                             },
@@ -224,8 +227,11 @@ private static object Message()
                                 {
                                     new
                                     {
-                                        id = "id",
-                                        marketplace = "amazon"
+                                        product = new
+                                        {
+                                            id = "id",
+                                            marketplace = "amazon"
+                                        }
                                     }
                                 }
                             }

tests/Sinch.Tests/Conversation/SendMessageTests.cs

@@ -344,22 +344,28 @@ public async Task SendList()
                         {
                             new
                             {
-                                title = "listitemchoice",
-                                postback_data = "postno",
-                                description = "desc",
-                                media = new
+                                choice = new
                                 {
-                                    url = "https://nolocalhost",
-                                    thumbnail_url = "https://knowyourmeme.com/photos/377946"
+                                    title = "listitemchoice",
+                                    postback_data = "postno",
+                                    description = "desc",
+                                    media = new
+                                    {
+                                        url = "https://nolocalhost",
+                                        thumbnail_url = "https://knowyourmeme.com/photos/377946"
+                                    }
                                 }
                             },
                             new
                             {
-                                id = "prod_id",
-                                marketplace = "amazon",
-                                currency = "eur",
-                                quantity = 20,
-                                item_price = 12.1000004f,
+                                product = new
+                                {
+                                    id = "prod_id",
+                                    marketplace = "amazon",
+                                    currency = "eur",
+                                    quantity = 20,
+                                    item_price = 12.1000004f,
+                                }
                             }
                         }
                     }
@@ -376,7 +382,7 @@ public async Task SendList()
                         Title = "item1",
                         Items = new List<IListItem>()
                         {
-                            new ListItemChoice()
+                            new ChoiceItem()
                             {
                                 Title = "listitemchoice",
                                 PostbackData = "postno",
@@ -387,7 +393,7 @@ public async Task SendList()
                                     ThumbnailUrl = new Uri("https://knowyourmeme.com/photos/377946")
                                 }
                             },
-                            new ListItemProduct
+                            new ProductItem
                             {
                                 Id = "prod_id",
                                 Marketplace = "amazon",