Merge pull request #16 from Adexandria/feature/many-to-many-mapping

Fix/many to many mapping

Automapify.Client/BenchmarkTest.cs

@@ -14,6 +14,7 @@ public void Setup()
             {
                 Classroom = new Classroom("Jss2")
             };
+            _student.AddTeacher("Adeola", "Ade");
 
             _students = new List<Student> { _student };
         }

Automapify.Client/MappingService.cs

@@ -2,6 +2,7 @@
 using Automapify.Client.Models;
 using Automapify.Client.Models.Dtos;
 using Automapify.Services;
+using Automapify.Services.Extensions;
 
 namespace Automapify.Client
 {
@@ -11,11 +12,14 @@ public static MapifyConfiguration StudentConfig()
         {
             return new MapifyConfigurationBuilder<Student, StudentDto>()
                 .Map(d => d.Name, s => $"{s.FirstName} {s.LastName}")
-                .Map(d=> d.Classroom, s => s.Classroom.Room)
-                .Map(d=> d.Room, s => s.Classroom)
+                .Map(d => d.Classroom, s => s.Classroom.Room)
+                .Map(d => d.Room, s => s.Classroom)
                 .Map(d => d.Age, s => s.DateOfBirth.ToAge())
-                .Map(d=>d.DOB, s => s.DateOfBirth)
-                .Map(d=>d.IsDeleted, s => false)
+                .Map(d => d.DOB, s => s.DateOfBirth)
+                .Map(d => d.IsDeleted, s => false)
+                .Map(d => d.Teachers.MapTo(s => s.Name), s => s.Teachers.MapFrom(p => $"{p.FirstName} {p.LastName}"))
+                .Map(d => d.TeacherNames, s => s.Teachers.MapFrom(p => $"{p.FirstName} {p.LastName}"))
+                .Map(d => d.Classrooms, s => s.Classrooms)
                 .CreateConfig();
         }
     }

Automapify.Client/Models/Dtos/Classroom.cs

@@ -8,6 +8,10 @@ namespace Automapify.Client.Models.Dtos
 {
     public class Classroom
     {
+        public Classroom()
+        {
+
+        }
         public Classroom(string room)
         {
             Room = room;

Automapify.Client/Models/Dtos/StudentDto.cs

@@ -17,6 +17,12 @@ public class StudentDto
         [MapProperty("Classroom")]
         public Classroom Room { get; set; }
 
+        public List<Classroom> Classrooms { get; set; }
+
+        public List<string> TeacherNames { get; set; }
+
+        public List<TeacherDto> Teachers { get; set; }
+
         public void DisplayFullName()
         {
             Console.WriteLine(Name);

Automapify.Client/Models/Dtos/TeacherDto.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Automapify.Client.Models.Dtos
+{
+    public class TeacherDto
+    {
+        public string Name { get; set; }
+    }
+}

Automapify.Client/Models/Student.cs

@@ -9,19 +9,38 @@ namespace Automapify.Client.Models
 {
     public class Student
     {
+        public Student()
+        {
+
+        }
         public Student(int id, string firstName, string lastName, string dateOfBirth, string _class)
         {
             Id = id;
             FirstName = firstName;
             LastName = lastName;
             DateOfBirth = DateTime.Parse(dateOfBirth);
             Class = _class;
+            Teachers = new List<Teacher>();
+            Classrooms = new List<Classroom>();
+        }
+
+
+        public void AddTeacher(string firstName, string lastName)
+        {
+            Teachers.Add(new Teacher(firstName, lastName).AssignClassroom(Classroom));
+        }
+
+        public void AddClassroom(string room)
+        {
+            Classrooms.Add(new Classroom(room));
         }
         public int Id { get; set; }
         public string FirstName { get; set; }
         public string LastName { get; set; }
         public DateTime DateOfBirth { get; set; }
         public string Class { get; set; }
         public Classroom Classroom { get; set; }
+        public List<Classroom> Classrooms { get; set; } 
+        public List<Teacher> Teachers { get; set; }
     }
 }

Automapify.Client/Models/Teacher.cs

@@ -0,0 +1,27 @@
+using Automapify.Client.Models.Dtos;
+
+namespace Automapify.Client.Models
+{
+    public class Teacher
+    {
+        public Teacher()
+        {
+
+        }
+        public Teacher(string firstName, string lastName)
+        {
+            FirstName = firstName;
+            LastName = lastName;
+        }
+
+        public Teacher AssignClassroom(Classroom classroom)
+        {
+            Classroom = classroom;
+            return this;
+        }
+
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public Classroom Classroom { get; set; }
+    }
+}

Automapify.Client/Program.cs

@@ -8,18 +8,21 @@
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Toolchains.InProcess.Emit;
-using BenchmarkDotNet.Toolchains.InProcess.NoEmit;
 
 // Set up student and classroom data
 var student = new Student(1, "Adeola", "Aderibigbe", "11/12/2000", "jss1");
 
 var classroom = new Classroom("Jss2");
 
 student.Classroom = classroom;
+student.AddClassroom("Jss3");
+
+student.AddTeacher("Violet", "James");
 
 // Map a list of students to a list of student dtos using mapping configuration
 var students = new List<Student>() { student };
 
+
 var studentDtos = student.Map<Student, List<StudentDto>>(MappingService.StudentConfig());
 
 
@@ -65,12 +68,12 @@
 
     item.DisplayAge();
 }
-
+/*
 var config = DefaultConfig.Instance
     .AddJob(Job
          .MediumRun
          .WithLaunchCount(1)
          .WithToolchain(InProcessEmitToolchain.Instance));
 
-//var summary = BenchmarkRunner.Run(typeof(BenchmarkTest),config);
+var summary = BenchmarkRunner.Run(typeof(BenchmarkTest), config);*/
 

Automapify.Test/Models/Classroom.cs

@@ -8,6 +8,10 @@ namespace Automapify.Test.Models
 {
     public class Classroom
     {
+        public Classroom()
+        {
+
+        }
         public Classroom(string name,int noOfStudents, int noOfTeachers,string classCode)
         {
             Id = 1;

Automapify.Test/Models/Course.cs

@@ -2,6 +2,10 @@
 {
     public class Course
     {
+        public Course()
+        {
+
+        }
         public Course(string name, string courseCode)
         {
             Id = 1;

Automapify.Test/Models/Lecturer.cs

@@ -2,6 +2,10 @@
 {
     public class Lecturer
     {
+        public Lecturer()
+        {
+
+        }
         public Lecturer(string name)
         {
             Id = 1;

Automapify.Test/TestHelper.cs

@@ -1,4 +1,5 @@
 using Automapify.Services;
+using Automapify.Services.Extensions;
 using Automapify.Test.Models;
 
 namespace Automapify.Test
@@ -34,9 +35,9 @@ private MapifyConfiguration SetupConfiguration()
                 .Map(d=>d.Name,s=>s.Name)
                 .Map(d=>d.NoOfLecturers, s=>s.NumberOfTeachers)
                 .Map(d=>d.NoOfStudents, s=>s.NumberOfStudents)
-                .Map(d=>d.LeadLecturers, s=>s.Courses.Select(s=>s.LeadLecturer.Name).ToList())
-                .Map(d=>d.IsActive, s=>s.NumberOfTeachers > 0 && s.NumberOfStudents > 0)
-                .Map(d=> d.Code, s=>s.ClassCode.ToString())
+                .Map(d=>d.LeadLecturers, s => s.Courses.MapFrom(s=>s.LeadLecturer.Name))
+                .Map(d=>d.IsActive, s => s.NumberOfTeachers > 0 && s.NumberOfStudents > 0)
+                .Map(d=> d.Code, s => s.ClassCode.ToString())
                 .CreateConfig();
             return MapifyConfiguration;
         }

Automapify/Models/MapifyTuple.cs

@@ -4,12 +4,23 @@ namespace Automapify.Models
 {
     public class MapifyTuple
     {
-        public MapifyTuple(string destinationMemberName, LambdaExpression expression)
+        public MapifyTuple(List<string> destinationMembers, string sourceName ,LambdaExpression sourceExpression)
         {
-            DestinationMemberName = destinationMemberName;
-            SourceExpression = expression.Compile();
+            DestinationMemberNames = destinationMembers;
+            SourceMemberName = sourceName;
+            SourceExpression = sourceExpression.Compile();
         }
-        public string DestinationMemberName { get; set; }
+        public MapifyTuple(string destinationMember, string sourceName, LambdaExpression sourceExpression)
+        {
+            DestinationMemberNames.Add(destinationMember);
+            SourceMemberName = sourceName;
+            SourceExpression = sourceExpression.Compile();
+        }
+
+
+        public List<string> DestinationMemberNames { get; set; } = new List<string>();
+
+        public string SourceMemberName { get; set; }
         public Delegate SourceExpression { get; set; }
     }
 }

Automapify/Models/Property.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Automapify.Models
+{
+    public class Property
+    {
+        public Property(string propertyName)
+        {
+            PropertyName = propertyName;    
+        }
+
+        public string SourceName { get; set; }
+        public string PropertyName { get; set; }
+    }
+}

Automapify/Services/Extensions/MappingExtension.cs

@@ -0,0 +1,18 @@
+using System.Linq.Expressions;
+
+namespace Automapify.Services.Extensions
+{
+    public static class MappingExtension
+    {
+        public static Expression<Func<TSource, SourceMember>> MapFrom<TSource, SourceMember>(this IEnumerable<TSource> source, Expression<Func<TSource, SourceMember>> sourcePredicate)
+        {
+            return sourcePredicate;
+        }
+
+        public static Expression<Func<TSource,SourceMember>> MapTo<TSource, SourceMember>(this IEnumerable<TSource> destination, Expression<Func<TSource, SourceMember>> sourcePredicate)
+        {
+            return sourcePredicate;
+        }
+
+    }
+}

Automapify/Services/Extensions/StringExtensions.cs

@@ -17,6 +17,14 @@ public static bool NotContains(this string source, string parameter)
             return !source.Contains(parameter);
         }
 
+        public static bool Contains(this IEnumerable<string> source, string firstParameter, string secondParameter)
+        {
+            if (source.Count() == 0)
+                return true;
+
+            return source.Contains(firstParameter) && source.Contains(secondParameter);
+        }
+
         public static bool NotStartsWith(this string source, string parameter)
         {
             if (string.IsNullOrEmpty(source))