Embedded object key change to _embedded_items

Author: uttamukkoji

Contentstack.Utils/Interfaces/IEmbeddedObject.cs

@@ -8,10 +8,6 @@ string Uid
             get;
             set;
         }
-    }
-
-    public interface IEmbeddedContentTypeUid: IEmbeddedObject
-    {
         string ContentTypeUid
         {
             get;

Contentstack.Utils/Interfaces/IEntryEmbedable.cs

@@ -5,13 +5,7 @@ namespace Contentstack.Utils.Interfaces
 {
     public interface IEntryEmbedable
     {
-        Dictionary<string, List<IEmbeddedContentTypeUid>> embeddedEntries
-        {
-            get;
-            set;
-        }
-
-        Dictionary<string, List<IEmbeddedAsset>> embeddedAssets
+        Dictionary<string, List<IEmbeddedObject>> embeddedItems
         {
             get;
             set;

Contentstack.Utils/Models/Options.cs

@@ -27,8 +27,8 @@ public virtual string RenderOption(IEmbeddedObject embeddedObject, Metadata meta
                     string renderString = "<div><p>" + embeddedObject.Uid +"</p>";
                     if (embeddedObject is IEmbeddedEntry) {
                         renderString += "<p>Content type: <span>" + ((IEmbeddedEntry)embeddedObject).Title + "</span></p>";
-                    } else if (embeddedObject is IEmbeddedContentTypeUid) {
-                        renderString += "<p>Content type: <span>" + ((IEmbeddedContentTypeUid)embeddedObject).ContentTypeUid + "</span></p>";
+                    } else {
+                        renderString += "<p>Content type: <span>" + embeddedObject.ContentTypeUid + "</span></p>";
                     }
                     renderString = renderString + "</div>";
                     return renderString;

Contentstack.Utils/Utils.cs

@@ -3,6 +3,7 @@
 using HtmlAgilityPack;
 using Contentstack.Utils.Extensions;
 using Contentstack.Utils.Interfaces;
+using System;
 
 namespace Contentstack.Utils
 {
@@ -42,40 +43,23 @@ public static List<string> RenderContent(List<string> contents, Options options)
 
         private static IEmbeddedObject findEmbeddedObject(Metadata metadata, IEntryEmbedable entryEmbedable)
         {
-            switch (metadata.ItemType)
+        
+            if (entryEmbedable.embeddedItems.Count > 0)
             {
-                case Enums.EmbedItemType.Asset:
-                    if (entryEmbedable.embeddedAssets.Count > 0)
-                    {
-                        foreach (var embed in entryEmbedable.embeddedAssets)
-                        {
-                            if (embed.Value.Count > 0)
-                            {
-                                IEmbeddedAsset embeddedAsset = embed.Value.Find(asset => asset.Uid == metadata.ItemUid);
-                                if (embeddedAsset != null)
-                                {
-                                    return embeddedAsset;
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case Enums.EmbedItemType.Entry:
-                    if (entryEmbedable.embeddedAssets.Count > 0)
+                foreach (var embed in entryEmbedable.embeddedItems)
+                {
+                    if (embed.Value.Count > 0)
                     {
-                        foreach (var embed in entryEmbedable.embeddedEntries)
+                        IEmbeddedObject embeddedObject = embed.Value.Find(entry => {
+                            Console.WriteLine(entry);
+                            return entry.Uid == metadata.ItemUid && entry.ContentTypeUid == metadata.ContentTypeUid;
+                         });
+                        if (embeddedObject != null)
                         {
-                            if (embed.Value.Count > 0)
-                            {
-                                IEmbeddedObject embeddedObject = embed.Value.Find(entry => entry.Uid == metadata.ItemUid);
-                                if (embeddedObject != null)
-                                {
-                                    return embeddedObject;
-                                }
-                            }
+                            return embeddedObject;
                         }
                     }
-                    break;
+                }
             }
             return null;
         }