Update automapper

InventoryTraker.Web/Controllers/ControllerBase.cs

@@ -1,6 +1,8 @@
 using System.Linq;
 using System.Web.Mvc;
+using AutoMapper;
 using InventoryTraker.Web.ActionResults;
+using InventoryTraker.Web.Data;
 using InventoryTraker.Web.Utilities;
 using NLog;
 

InventoryTraker.Web/Controllers/InventoryController.cs

@@ -15,10 +15,12 @@ namespace InventoryTraker.Web.Controllers
 	public class InventoryController : ControllerBase
 	{
 		private readonly AppDbContext _context;
+		private readonly IMapper _mapper;
 
-		public InventoryController(AppDbContext context)
+		public InventoryController(AppDbContext context, IMapper mapper)
 		{
 			_context = context;
+			_mapper = mapper;
 		}
 
 		public ActionResult Index()
@@ -30,7 +32,7 @@ namespace InventoryTraker.Web.Controllers
 		{
 			var viewModels =
 				CurrentInventory()
-				.ProjectTo<InventoryViewModel>()
+				.ProjectTo<InventoryViewModel>(_mapper.ConfigurationProvider)
 				.ToArray();
 
 			return BetterJson(viewModels);
@@ -39,7 +41,7 @@ namespace InventoryTraker.Web.Controllers
 		public JsonResult Find(int id)
 		{
 			var inventory = _context.Inventories.Find(id);
-			var viewModel = Mapper.Map<InventoryViewModel>(inventory);
+			var viewModel = _mapper.Map<InventoryViewModel>(inventory);
 			return BetterJson(viewModel);
 		}
 
@@ -57,7 +59,7 @@ namespace InventoryTraker.Web.Controllers
 
 			var viewModels =
 				CurrentInventory()
-				.ProjectTo<InventoryViewModel>()
+				.ProjectTo<InventoryViewModel>(_mapper.ConfigurationProvider)
 				.ToArray();
 
 			var excel = writer.Write(viewModels);
@@ -77,7 +79,7 @@ namespace InventoryTraker.Web.Controllers
 			if (!ModelState.IsValid)
 				return GetModelStateErrorListJson();
 
-			var inventory = Mapper.Map<Inventory>(form);
+			var inventory = _mapper.Map<Inventory>(form);
 			inventory.InventoryType = _context.InventoryTypes.Find(form.InventoryTypeId);
 
 			if (inventory.InventoryType == null)
@@ -98,7 +100,7 @@ namespace InventoryTraker.Web.Controllers
 			};
 			_context.SaveChanges();
 
-			var model = Mapper.Map<InventoryViewModel>(inventory);
+			var model = _mapper.Map<InventoryViewModel>(inventory);
 			return BetterJson(model);
 		}
 
@@ -156,7 +158,7 @@ namespace InventoryTraker.Web.Controllers
 			_context.SaveChanges();
 
 			return BetterJson(CurrentInventory()
-				.ProjectTo<InventoryViewModel>()
+				.ProjectTo<InventoryViewModel>(_mapper.ConfigurationProvider)
 				.ToArray());
 		}
 
@@ -207,7 +209,8 @@ namespace InventoryTraker.Web.Controllers
 
 			_context.SaveChanges();
 
-			return BetterJson(Mapper.Map<InventoryViewModel>(inventory));
+			return BetterJson(_mapper.Map<InventoryViewModel>(inventory));
 		}
+
 	}
 }

InventoryTraker.Web/Controllers/InventoryTypeController.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
 using AutoMapper;
@@ -14,10 +13,12 @@ namespace InventoryTraker.Web.Controllers
 	public class InventoryTypeController : ControllerBase
 	{
 		private readonly AppDbContext _context;
+		private readonly IMapper _mapper;
 
-		public InventoryTypeController(AppDbContext context)
+		public InventoryTypeController(AppDbContext context, IMapper mapper)
 		{
 			_context = context;
+			_mapper = mapper;
 		}
 
 		public ActionResult Index()
@@ -29,7 +30,7 @@ namespace InventoryTraker.Web.Controllers
 		{
 			var viewModels = _context.InventoryTypes
 				.OrderByDescending(x => x.Name)
-				.ProjectTo<InventoryTypeViewModel>();
+				.ProjectTo<InventoryTypeViewModel>(_mapper.ConfigurationProvider);
 
 			return BetterJson(viewModels.ToArray());
 		}
@@ -41,7 +42,7 @@ namespace InventoryTraker.Web.Controllers
 			var viewModels =
 				_context.InventoryTypes
 				.OrderByDescending(x => x.Name)
-				.ProjectTo<InventoryTypeViewModel>()
+				.ProjectTo<InventoryTypeViewModel>(_mapper.ConfigurationProvider)
 				.ToArray();
 
 			var excel = writer.Write(viewModels);
@@ -60,11 +61,11 @@ namespace InventoryTraker.Web.Controllers
 			if (!ModelState.IsValid)
 				return GetModelStateErrorListJson();
 
-			var inventoryType = Mapper.Map<InventoryType>(form);
+			var inventoryType = _mapper.Map<InventoryType>(form);
 			_context.InventoryTypes.Add(inventoryType);
 			_context.SaveChanges();
 
-			var model = Mapper.Map<InventoryTypeViewModel>(inventoryType);
+			var model = _mapper.Map<InventoryTypeViewModel>(inventoryType);
 			return BetterJson(model);
 		}
 
@@ -74,11 +75,11 @@ namespace InventoryTraker.Web.Controllers
 				return GetModelStateErrorListJson();
 
 			var inventoryType = _context.InventoryTypes.Find(form.Id);
-			Mapper.Map(form, inventoryType);
+			_mapper.Map(form, inventoryType);
 
 			_context.SaveChanges();
 
-			var model = Mapper.Map<InventoryTypeViewModel>(inventoryType);
+			var model = _mapper.Map<InventoryTypeViewModel>(inventoryType);
 			return BetterJson(model);
 		}
 	}

InventoryTraker.Web/Controllers/ProfileController.cs

@@ -10,16 +10,18 @@ namespace InventoryTraker.Web.Controllers
 	public class ProfileController : ControllerBase
 	{
 		private readonly ApplicationUserManager _userManager;
+		private readonly IMapper _mapper;
 
-		public ProfileController(ApplicationUserManager userManager)
+		public ProfileController(ApplicationUserManager userManager, IMapper mapper)
 		{
 			_userManager = userManager;
+			_mapper = mapper;
 		}
 
 		public ActionResult Index()
 		{
 			var user = _userManager.FindById(User.Identity.GetUserId());
-			var model = Mapper.Map<ProfileForm>(user);
+			var model = _mapper.Map<ProfileForm>(user);
 			return View(model);
 		}
 

InventoryTraker.Web/Controllers/ReportController.cs

@@ -9,10 +9,17 @@ namespace InventoryTraker.Web.Controllers
 	public class ReportController : ControllerBase
 	{
 		private readonly ReportService _reportService;
+		private readonly DistributionReportWriter _distributionReportWriter;
+		private readonly MovementReportWriter _movementReportWriter;
 
-		public ReportController(ReportService reportService)
+		public ReportController(
+			ReportService reportService, 
+			DistributionReportWriter distributionReportWriter,
+			MovementReportWriter movementReportWriter)
 		{
 			_reportService = reportService;
+			_distributionReportWriter = distributionReportWriter;
+			_movementReportWriter = movementReportWriter;
 		}
 
 		[HttpGet]
@@ -32,8 +39,7 @@ namespace InventoryTraker.Web.Controllers
 		{
 			var report = _reportService.GetDistributionReport(startDate, endDate);
 
-			var writer = new DistributionReportWriter();
-			var excel = writer.Write(report);
+			var excel = _distributionReportWriter.Write(report);
 
 			var filename = $"InventoryDistributionReport{startDate:yyyyMMdd}-{endDate:yyyyMMdd}.xlsx";
 
@@ -61,8 +67,7 @@ namespace InventoryTraker.Web.Controllers
 		{
 			var report = _reportService.GetMovementReport(month);
 
-			var writer = new MovementReportWriter();
-			var excel = writer.Write(report);
+			var excel = _movementReportWriter.Write(report);
 
 			var filename = $"MonthlyInventoryReport{report.Month:MMMMyyyy}.xlsx";
 

InventoryTraker.Web/Controllers/TransactionController.cs

@@ -1,6 +1,6 @@
-using System.Collections;
-using System.Linq;
+using System.Linq;
 using System.Web.Mvc;
+using AutoMapper;
 using AutoMapper.QueryableExtensions;
 using InventoryTraker.Web.Attributes;
 using InventoryTraker.Web.Core;
@@ -12,10 +12,12 @@ namespace InventoryTraker.Web.Controllers
 	public class TransactionController : ControllerBase
 	{
 		private readonly AppDbContext _context;
+		private readonly IMapper _mapper;
 
-		public TransactionController(AppDbContext context)
+		public TransactionController(AppDbContext context, IMapper mapper)
 		{
 			_context = context;
+			_mapper = mapper;
 		}
 
 		public ActionResult Index()
@@ -27,7 +29,7 @@ namespace InventoryTraker.Web.Controllers
 		{
 			var viewModels =
 				_context.Transactions
-				.ProjectTo<TransactionViewModel>()
+				.ProjectTo<TransactionViewModel>(_mapper.ConfigurationProvider)
 				.ToArray();
 
 			return BetterJson(viewModels);
@@ -50,7 +52,7 @@ namespace InventoryTraker.Web.Controllers
 			
 			var totalItems = _context.Transactions.Count();
 			var transactions = query
-						.ProjectTo<TransactionViewModel>()
+						.ProjectTo<TransactionViewModel>(_mapper.ConfigurationProvider)
 						.ToArray();
 			return BetterJson(new { totalItems, transactions });
 		}

InventoryTraker.Web/Controllers/UserController.cs

@@ -14,23 +14,25 @@ namespace InventoryTraker.Web.Controllers
     public class UserController : ControllerBase
 	{
 		private readonly ApplicationUserManager _userManager;
+	    private readonly IMapper _mapper;
 
-		public UserController(ApplicationUserManager userManager)
-		{
-			_userManager = userManager;
-		}
+	    public UserController(ApplicationUserManager userManager, IMapper mapper)
+	    {
+		    _userManager = userManager;
+		    _mapper = mapper;
+	    }
 
-		public ActionResult Index()
+	    public ActionResult Index()
 		{
 			return View();
 		}
 
 	    public JsonResult All()
 	    {
-			var users =
+		    var users =
 				_userManager
 				.Users
-				.ProjectTo<UserViewModel>()
+				.ProjectTo<UserViewModel>(_mapper.ConfigurationProvider)
 				.OrderBy(u => u.UserName);
 
 		    return BetterJson(users);
@@ -47,7 +49,7 @@ namespace InventoryTraker.Web.Controllers
 				new User
 				{
 					Email = form.Email,
-					UserName = form.UserName
+					UserName = form.UserName,
 				};
 
 			var identityResult = await _userManager.CreateAsync(user, form.Password);
@@ -55,7 +57,7 @@ namespace InventoryTraker.Web.Controllers
 			if (!identityResult.Succeeded)
 				return GetErrorListJson(identityResult.Errors.ToArray());
 
-			return BetterJson(Mapper.Map<UserViewModel>(user));
+			return BetterJson(_mapper.Map<UserViewModel>(user));
 		}
 
 		[ActionLog]
@@ -83,7 +85,7 @@ namespace InventoryTraker.Web.Controllers
 			if (!identityResult.Succeeded)
 				return GetErrorListJson(identityResult.Errors.ToArray());
 
-			return BetterJson(Mapper.Map<UserViewModel>(user));
+			return BetterJson(_mapper.Map<UserViewModel>(user));
 		}
 	}
 }