Merge pull request #1868 from for7raid/issue1865

fix #1865 Wrong type after include directive

Author: lbnascimento

LiteDB.Tests/Issues/Issue1651_Tests.cs

@@ -5,22 +5,24 @@
 
 namespace LiteDB.Tests.Issues
 {
-    public class Order : BaseEntity
+    
+    public class Issue1651_Tests
     {
-        public Customer Customer { get; set; }
-    }
+        public class Order : BaseEntity
+        {
+            public Customer Customer { get; set; }
+        }
 
-    public class Customer : BaseEntity
-    {
-        public string Name { get; set; }
-    }
+        public class Customer : BaseEntity
+        {
+            public string Name { get; set; }
+        }
+
+        public class BaseEntity
+        {
+            public Guid Id { get; set; }
+        }
 
-    public class BaseEntity
-    {
-        public Guid Id { get; set; }
-    }
-    public class Issue1651_Tests
-    {
         [Fact]
         public void Find_ByRelationId_Success()
         {

LiteDB.Tests/Issues/Issue1865_Tests.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using Xunit;
+using System.Linq;
+using System.Security.Cryptography;
+
+namespace LiteDB.Tests.Issues
+{
+
+    public class Issue1865_Tests
+    {
+        public class Project : BaseEntity
+        {
+            public List<BaseEntity> Points { get; set; } = new List<BaseEntity>();
+        }
+
+        public class Point : BaseEntity
+        {
+            public BaseEntity Project { get; set; }
+            public BaseEntity Parent { get; set; }
+            public DateTime Start { get; internal set; }
+            public DateTime End { get; internal set; }
+        }
+
+        public class BaseEntity
+        {
+            public ObjectId Id { get; set; } = ObjectId.NewObjectId();
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public void Incluced_document_types_should_be_reald()
+        {
+            BsonMapper.Global.Entity<Point>().DbRef(p => p.Project, "activity");
+            BsonMapper.Global.Entity<Point>().DbRef(p => p.Parent, "activity");
+            BsonMapper.Global.Entity<Project>().DbRef(p => p.Points, "activity");
+
+            //BsonMapper.Global.ResolveCollectionName = (s) => "activity";
+
+            using var _database = new LiteDatabase(":memory:");
+            var projectsCol = _database.GetCollection<Project>("activity");
+            var pointsCol = _database.GetCollection<Point>("activity");
+
+            var project = new Project() { Name = "Project" };
+            var point1 = new Point { Parent = project, Project = project, Name = "Point 1", Start = DateTime.Now, End = DateTime.Now.AddDays(2) };
+            var point2 = new Point { Parent = point1, Project = project, Name = "Point 2", Start = DateTime.Now, End = DateTime.Now.AddDays(2) };
+            
+            project.Points.Add(point1);
+            project.Points.Add(point2);
+
+            pointsCol.Insert(point1);
+            pointsCol.Insert(point2);
+            projectsCol.Insert(project);
+
+
+            var p1 = pointsCol
+                .FindById(point1.Id);
+            Assert.Equal(typeof(Project), p1.Parent.GetType());
+            Assert.Equal(typeof(Project), p1.Project.GetType());
+
+            var p2 = pointsCol
+                .FindById(point2.Id);
+            Assert.Equal(typeof(Point), p2.Parent.GetType());
+            Assert.Equal(typeof(Project), p2.Project.GetType());
+
+            var prj = projectsCol
+                 .FindById(project.Id);
+            Assert.Equal(typeof(Point), prj.Points[0].GetType());
+
+            p1 = pointsCol
+                .Include(p => p.Parent).Include(p => p.Project)
+                .FindById(point1.Id);
+            Assert.Equal(typeof(Project), p1.Parent.GetType());
+            Assert.Equal(typeof(Project), p1.Project.GetType());
+
+            p2 = pointsCol
+                .Include(p => p.Parent).Include(p => p.Project)
+                .FindById(point2.Id);
+            Assert.Equal(typeof(Point), p2.Parent.GetType());
+            Assert.Equal(typeof(Project), p2.Project.GetType());
+
+            prj = projectsCol
+                .Include(p => p.Points)
+                .FindById(project.Id);
+            Assert.Equal(typeof(Point), prj.Points[0].GetType());
+        }
+    }
+}

LiteDB/Client/Mapper/BsonMapper.cs

@@ -508,8 +508,13 @@ private static void RegisterDbRefItem(BsonMapper mapper, MemberMapper member, IT
                 if (included)
                 {
                     doc["_id"] = idRef;
+                    if (doc.ContainsKey("$type"))
+                    {
+                        doc["_type"] = bson["$type"];
+                    }
 
                     return m.Deserialize(entity.ForType, doc);
+                    
                 }
                 else
                 {
@@ -588,6 +593,10 @@ private static void RegisterDbRefList(BsonMapper mapper, MemberMapper member, IT
                     if (included)
                     {
                         item["_id"] = idRef;
+                        if (item.AsDocument.ContainsKey("$type"))
+                        {
+                            item["_type"] = item["$type"];
+                        }
 
                         result.Add(item);
                     }