Simplify Mapping

src/Application/Common/Mappings/MappingExtensions.cs

@@ -1,6 +1,4 @@
-using AutoMapper;
-using AutoMapper.QueryableExtensions;
-using CleanArchitecture.Application.Common.Models;
+using CleanArchitecture.Application.Common.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace CleanArchitecture.Application.Common.Mappings;

src/Application/Common/Models/LookupDto.cs

@@ -1,12 +1,19 @@
-using CleanArchitecture.Application.Common.Mappings;
-using CleanArchitecture.Domain.Entities;
+using CleanArchitecture.Domain.Entities;
 
 namespace CleanArchitecture.Application.Common.Models;
 
-// Note: This is currently just used to demonstrate applying multiple IMapFrom attributes.
-public class LookupDto : IMapFrom<TodoList>, IMapFrom<TodoItem>
+public class LookupDto
 {
     public int Id { get; init; }
 
     public string? Title { get; init; }
+
+    private class Mapping : Profile
+    {
+        public Mapping()
+        {
+            CreateMap<TodoList, LookupDto>();
+            CreateMap<TodoItem, LookupDto>();
+        }
+    }
 }

src/Application/ConfigureServices.cs

@@ -1,6 +1,5 @@
 using System.Reflection;
 using CleanArchitecture.Application.Common.Behaviours;
-using CleanArchitecture.Application.Common.Exceptions;
 using FluentValidation;
 using MediatR;
 

src/Application/GlobalUsings.cs

@@ -0,0 +1,2 @@
+global using AutoMapper;
+global using AutoMapper.QueryableExtensions;

src/Application/TodoItems/Queries/GetTodoItemsWithPagination/GetTodoItemsWithPaginationQuery.cs

@@ -1,6 +1,4 @@
-using AutoMapper;
-using AutoMapper.QueryableExtensions;
-using CleanArchitecture.Application.Common.Interfaces;
+using CleanArchitecture.Application.Common.Interfaces;
 using CleanArchitecture.Application.Common.Mappings;
 using CleanArchitecture.Application.Common.Models;
 using MediatR;

src/Application/TodoItems/Queries/GetTodoItemsWithPagination/TodoItemBriefDto.cs

@@ -1,9 +1,8 @@
-using CleanArchitecture.Application.Common.Mappings;
-using CleanArchitecture.Domain.Entities;
+using CleanArchitecture.Domain.Entities;
 
 namespace CleanArchitecture.Application.TodoItems.Queries.GetTodoItemsWithPagination;
 
-public class TodoItemBriefDto : IMapFrom<TodoItem>
+public class TodoItemBriefDto
 {
     public int Id { get; init; }
 
@@ -12,4 +11,12 @@ public class TodoItemBriefDto : IMapFrom<TodoItem>
     public string? Title { get; init; }
 
     public bool Done { get; init; }
+
+    private class Mapping : Profile
+    {
+        public Mapping()
+        {
+            CreateMap<TodoItem, TodoItemBriefDto>();
+        }
+    }
 }

src/Application/TodoLists/Queries/ExportTodos/ExportTodosQuery.cs

@@ -1,6 +1,4 @@
-using AutoMapper;
-using AutoMapper.QueryableExtensions;
-using CleanArchitecture.Application.Common.Interfaces;
+using CleanArchitecture.Application.Common.Interfaces;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 

src/Application/TodoLists/Queries/ExportTodos/TodoItemRecord.cs

@@ -0,0 +1,18 @@
+using CleanArchitecture.Domain.Entities;
+
+namespace CleanArchitecture.Application.TodoLists.Queries.ExportTodos;
+
+public class TodoItemRecord
+{
+    public string? Title { get; init; }
+
+    public bool Done { get; init; }
+
+    private class Mapping : Profile
+    {
+        public Mapping()
+        {
+            CreateMap<TodoItem, TodoItemRecord>();
+        }
+    }
+}

src/Application/TodoLists/Queries/GetTodos/GetTodosQuery.cs

@@ -1,6 +1,4 @@
-using AutoMapper;
-using AutoMapper.QueryableExtensions;
-using CleanArchitecture.Application.Common.Interfaces;
+using CleanArchitecture.Application.Common.Interfaces;
 using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Domain.Enums;
 using MediatR;

src/Application/TodoLists/Queries/GetTodos/TodoItemDto.cs

@@ -1,10 +1,8 @@
-using AutoMapper;
-using CleanArchitecture.Application.Common.Mappings;
-using CleanArchitecture.Domain.Entities;
+using CleanArchitecture.Domain.Entities;
 
 namespace CleanArchitecture.Application.TodoLists.Queries.GetTodos;
 
-public class TodoItemDto : IMapFrom<TodoItem>
+public class TodoItemDto
 {
     public int Id { get; init; }
 
@@ -18,9 +16,12 @@ public class TodoItemDto : IMapFrom<TodoItem>
 
     public string? Note { get; init; }
 
-    public void Mapping(Profile profile)
+    private class Mapping : Profile
     {
-        profile.CreateMap<TodoItem, TodoItemDto>()
-            .ForMember(d => d.Priority, opt => opt.MapFrom(s => (int)s.Priority));
+        public Mapping()
+        {
+            CreateMap<TodoItem, TodoItemDto>().ForMember(d => d.Priority, 
+                opt => opt.MapFrom(s => (int)s.Priority));
+        }
     }
 }

src/Application/TodoLists/Queries/GetTodos/TodoListDto.cs

@@ -1,9 +1,8 @@
-using CleanArchitecture.Application.Common.Mappings;
-using CleanArchitecture.Domain.Entities;
+using CleanArchitecture.Domain.Entities;
 
 namespace CleanArchitecture.Application.TodoLists.Queries.GetTodos;
 
-public class TodoListDto : IMapFrom<TodoList>
+public class TodoListDto
 {
     public TodoListDto()
     {
@@ -17,4 +16,12 @@ public TodoListDto()
     public string? Colour { get; init; }
 
     public IReadOnlyCollection<TodoItemDto> Items { get; init; }
+
+    private class Mapping : Profile
+    {
+        public Mapping()
+        {
+            CreateMap<TodoList, TodoListDto>();
+        }
+    }
 }

tests/Application.UnitTests/Common/Mappings/MappingTests.cs

@@ -1,7 +1,10 @@
-using System.Runtime.Serialization;
+using System.Reflection;
+using System.Runtime.Serialization;
 using AutoMapper;
-using CleanArchitecture.Application.Common.Mappings;
+using CleanArchitecture.Application.Common.Interfaces;
 using CleanArchitecture.Application.Common.Models;
+using CleanArchitecture.Application.TodoItems.Queries.GetTodoItemsWithPagination;
+using CleanArchitecture.Application.TodoLists.Queries.ExportTodos;
 using CleanArchitecture.Application.TodoLists.Queries.GetTodos;
 using CleanArchitecture.Domain.Entities;
 using NUnit.Framework;
@@ -16,7 +19,7 @@ public class MappingTests
     public MappingTests()
     {
         _configuration = new MapperConfiguration(config => 
-            config.AddProfile<MappingProfile>());
+            config.AddMaps(Assembly.GetAssembly(typeof(IApplicationDbContext))));
 
         _mapper = _configuration.CreateMapper();
     }
@@ -32,6 +35,8 @@ public void ShouldHaveValidConfiguration()
     [TestCase(typeof(TodoItem), typeof(TodoItemDto))]
     [TestCase(typeof(TodoList), typeof(LookupDto))]
     [TestCase(typeof(TodoItem), typeof(LookupDto))]
+    [TestCase(typeof(TodoItem), typeof(TodoItemRecord))]
+    [TestCase(typeof(TodoItem), typeof(TodoItemBriefDto))]
     public void ShouldSupportMappingFromSourceToDestination(Type source, Type destination)
     {
         var instance = GetInstanceOf(source);