diff --git a/Controllers/MatchesController.cs b/Controllers/MatchesController.cs index 74ddf32..5f690ea 100644 --- a/Controllers/MatchesController.cs +++ b/Controllers/MatchesController.cs @@ -27,7 +27,7 @@ namespace LiveGameFeed.Controllers [HttpGet] public IEnumerable Get() { - IEnumerable _matches = _matchRepository.GetAll(); + IEnumerable _matches = _matchRepository.AllIncluding(m => m.Feeds); IEnumerable _matchesVM = Mapper.Map, IEnumerable>(_matches); return _matchesVM; diff --git a/Core/Mappings/DomainToViewModelMappingProfile.cs b/Core/Mappings/DomainToViewModelMappingProfile.cs index aa4db2a..8e90c52 100644 --- a/Core/Mappings/DomainToViewModelMappingProfile.cs +++ b/Core/Mappings/DomainToViewModelMappingProfile.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using AutoMapper; using LiveGameFeed.Models; @@ -11,7 +12,7 @@ namespace LiveGameFeed.Core.Mappings Mapper.CreateMap() .ForMember(vm => vm.Type, map => map.MapFrom(m => m.Type.ToString())) .ForMember(vm => vm.Feeds, map => map.MapFrom(m => - Mapper.Map, ICollection>(m.Feeds))); + Mapper.Map, ICollection>(m.Feeds.OrderByDescending(f => f.Id).ToList()))); Mapper.CreateMap(); } } diff --git a/Startup.cs b/Startup.cs index 150071c..52fdc1d 100644 --- a/Startup.cs +++ b/Startup.cs @@ -37,8 +37,8 @@ namespace LiveGameFeed { services.AddDbContext(options => options.UseInMemoryDatabase()); // Repositories - services.AddSingleton(); - services.AddSingleton(); + services.AddScoped(); + services.AddScoped(); // Automapper Configuration AutoMapperConfiguration.Configure();