Updated to ASP.NET Core 3.1, fixed HATEOAS and other bugs

FabianGosebrink · FabianGosebrink · commit 4cc0df467376 · 2019-12-19T20:32:36.000+01:00
diff --git a/SampleWebApiAspNetCore/Controllers/v1/FoodsController.cs b/SampleWebApiAspNetCore/Controllers/v1/FoodsController.cs
@@ -23,7 +23,7 @@ public class FoodsController : ControllerBase
         private readonly IMapper _mapper;
 
         public FoodsController(
-            IUrlHelper urlHelper, 
+            IUrlHelper urlHelper,
             IFoodRepository foodRepository,
             IMapper mapper)
         {
@@ -33,9 +33,9 @@ public FoodsController(
         }
 
         [HttpGet(Name = nameof(GetAllFoods))]
-        public ActionResult GetAllFoods([FromQuery] QueryParameters queryParameters)
+        public ActionResult GetAllFoods(ApiVersion version, [FromQuery] QueryParameters queryParameters)
         {
-            List<FoodItem> foodItems = _foodRepository.GetAll(queryParameters).ToList();
+            List<FoodEntity> foodItems = _foodRepository.GetAll(queryParameters).ToList();
 
             var allItemCount = _foodRepository.Count();
 
@@ -50,9 +50,9 @@ public ActionResult GetAllFoods([FromQuery] QueryParameters queryParameters)
             Response.Headers.Add("X-Pagination",
                 Newtonsoft.Json.JsonConvert.SerializeObject(paginationMetadata));
 
-            var links = CreateLinksForCollection(queryParameters, allItemCount);
+            var links = CreateLinksForCollection(queryParameters, allItemCount, version);
 
-            var toReturn = foodItems.Select(x => ExpandSingleFoodItem(x));
+            var toReturn = foodItems.Select(x => ExpandSingleFoodItem(x, version));
 
             return Ok(new
             {
@@ -63,27 +63,27 @@ public ActionResult GetAllFoods([FromQuery] QueryParameters queryParameters)
 
         [HttpGet]
         [Route("{id:int}", Name = nameof(GetSingleFood))]
-        public ActionResult GetSingleFood(int id)
+        public ActionResult GetSingleFood(ApiVersion version, int id)
         {
-            FoodItem foodItem = _foodRepository.GetSingle(id);
+            FoodEntity foodItem = _foodRepository.GetSingle(id);
 
             if (foodItem == null)
             {
                 return NotFound();
             }
 
-            return Ok(ExpandSingleFoodItem(foodItem));
+            return Ok(ExpandSingleFoodItem(foodItem, version));
         }
 
         [HttpPost(Name = nameof(AddFood))]
-        public ActionResult<FoodItemDto> AddFood([FromBody] FoodCreateDto foodCreateDto)
+        public ActionResult<FoodDto> AddFood(ApiVersion version, [FromBody] FoodCreateDto foodCreateDto)
         {
             if (foodCreateDto == null)
             {
                 return BadRequest();
             }
 
-            FoodItem toAdd = _mapper.Map<FoodItem>(foodCreateDto);
+            FoodEntity toAdd = _mapper.Map<FoodEntity>(foodCreateDto);
 
             _foodRepository.Add(toAdd);
 
@@ -92,21 +92,21 @@ public ActionResult<FoodItemDto> AddFood([FromBody] FoodCreateDto foodCreateDto)
                 throw new Exception("Creating a fooditem failed on save.");
             }
 
-            FoodItem newFoodItem = _foodRepository.GetSingle(toAdd.Id);
+            FoodEntity newFoodItem = _foodRepository.GetSingle(toAdd.Id);
 
-            return CreatedAtRoute(nameof(GetSingleFood), new { id = newFoodItem.Id },
-                _mapper.Map<FoodItemDto>(newFoodItem));
+            return CreatedAtRoute(nameof(GetSingleFood), new { version = version.ToString(), id = newFoodItem.Id },
+                _mapper.Map<FoodDto>(newFoodItem));
         }
 
         [HttpPatch("{id:int}", Name = nameof(PartiallyUpdateFood))]
-        public ActionResult<FoodItemDto> PartiallyUpdateFood(int id, [FromBody] JsonPatchDocument<FoodUpdateDto> patchDoc)
+        public ActionResult<FoodDto> PartiallyUpdateFood(int id, [FromBody] JsonPatchDocument<FoodUpdateDto> patchDoc)
         {
             if (patchDoc == null)
             {
                 return BadRequest();
             }
 
-            FoodItem existingEntity = _foodRepository.GetSingle(id);
+            FoodEntity existingEntity = _foodRepository.GetSingle(id);
 
             if (existingEntity == null)
             {
@@ -124,21 +124,21 @@ public ActionResult<FoodItemDto> PartiallyUpdateFood(int id, [FromBody] JsonPatc
             }
 
             _mapper.Map(foodUpdateDto, existingEntity);
-            FoodItem updated = _foodRepository.Update(id, existingEntity);
+            FoodEntity updated = _foodRepository.Update(id, existingEntity);
 
             if (!_foodRepository.Save())
             {
                 throw new Exception("Updating a fooditem failed on save.");
             }
 
-            return Ok(_mapper.Map<FoodItemDto>(updated));
+            return Ok(_mapper.Map<FoodDto>(updated));
         }
 
         [HttpDelete]
         [Route("{id:int}", Name = nameof(RemoveFood))]
         public ActionResult RemoveFood(int id)
         {
-            FoodItem foodItem = _foodRepository.GetSingle(id);
+            FoodEntity foodItem = _foodRepository.GetSingle(id);
 
             if (foodItem == null)
             {
@@ -157,7 +157,7 @@ public ActionResult RemoveFood(int id)
 
         [HttpPut]
         [Route("{id:int}", Name = nameof(UpdateFood))]
-        public ActionResult<FoodItemDto> UpdateFood(int id, [FromBody]FoodUpdateDto foodUpdateDto)
+        public ActionResult<FoodDto> UpdateFood(int id, [FromBody]FoodUpdateDto foodUpdateDto)
         {
             if (foodUpdateDto == null)
             {
@@ -180,16 +180,16 @@ public ActionResult<FoodItemDto> UpdateFood(int id, [FromBody]FoodUpdateDto food
                 throw new Exception("Updating a fooditem failed on save.");
             }
 
-            return Ok(_mapper.Map<FoodItemDto>(existingFoodItem));
+            return Ok(_mapper.Map<FoodDto>(existingFoodItem));
         }
 
         [HttpGet("GetRandomMeal", Name = nameof(GetRandomMeal))]
         public ActionResult GetRandomMeal()
         {
-            ICollection<FoodItem> foodItems = _foodRepository.GetRandomMeal();
+            ICollection<FoodEntity> foodItems = _foodRepository.GetRandomMeal();
 
-            IEnumerable<FoodItemDto> dtos = foodItems
-                .Select(x => _mapper.Map<FoodItemDto>(x));
+            IEnumerable<FoodDto> dtos = foodItems
+                .Select(x => _mapper.Map<FoodDto>(x));
 
             var links = new List<LinkDto>();
 
@@ -203,7 +203,7 @@ public ActionResult GetRandomMeal()
             });
         }
 
-        private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters, int totalCount)
+        private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters, int totalCount, ApiVersion version)
         {
             var links = new List<LinkDto>();
 
@@ -249,46 +249,54 @@ private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters,
                 }), "previous", "GET"));
             }
 
+            var posturl = _urlHelper.Link(nameof(AddFood), new { version = version.ToString() });
+
             links.Add(
-               new LinkDto(_urlHelper.Link(nameof(AddFood), null),
+               new LinkDto(posturl,
                "create_food",
                "POST"));
 
             return links;
         }
 
-        private dynamic ExpandSingleFoodItem(FoodItem foodItem)
+        private dynamic ExpandSingleFoodItem(FoodEntity foodItem, ApiVersion version)
         {
-            var links = GetLinks(foodItem.Id);
-            FoodItemDto item = _mapper.Map<FoodItemDto>(foodItem);
+            var links = GetLinks(foodItem.Id, version);
+            FoodDto item = _mapper.Map<FoodDto>(foodItem);
 
             var resourceToReturn = item.ToDynamic() as IDictionary<string, object>;
             resourceToReturn.Add("links", links);
 
             return resourceToReturn;
         }
 
-        private IEnumerable<LinkDto> GetLinks(int id)
+        private IEnumerable<LinkDto> GetLinks(int id, ApiVersion version)
         {
             var links = new List<LinkDto>();
 
+            var getLink = _urlHelper.Link(nameof(GetSingleFood), new { version = version.ToString(), id = id });
+
             links.Add(
-              new LinkDto(_urlHelper.Link(nameof(GetSingleFood), new { id = id }),
-              "self",
-              "GET"));
+              new LinkDto(getLink, "self", "GET"));
+
+            var deleteLink = _urlHelper.Link(nameof(RemoveFood), new { version = version.ToString(), id = id });
 
             links.Add(
-              new LinkDto(_urlHelper.Link(nameof(RemoveFood), new { id = id }),
+              new LinkDto(deleteLink,
               "delete_food",
               "DELETE"));
 
+            var createLink = _urlHelper.Link(nameof(AddFood), new { version = version.ToString() });
+
             links.Add(
-              new LinkDto(_urlHelper.Link(nameof(AddFood), null),
+              new LinkDto(createLink,
               "create_food",
               "POST"));
 
+            var updateLink = _urlHelper.Link(nameof(UpdateFood), new { version = version.ToString(), id = id });
+
             links.Add(
-               new LinkDto(_urlHelper.Link(nameof(UpdateFood), new { id = id }),
+               new LinkDto(updateLink,
                "update_food",
                "PUT"));
 
diff --git a/SampleWebApiAspNetCore/Dtos/FoodDto.cs b/SampleWebApiAspNetCore/Dtos/FoodDto.cs
@@ -2,7 +2,7 @@
 
 namespace SampleWebApiAspNetCore.Dtos
 {
-    public class FoodItemDto
+    public class FoodDto
     {
         public int Id { get; set; }
         public string Name { get; set; }
diff --git a/SampleWebApiAspNetCore/Entities/FoodEntity.cs b/SampleWebApiAspNetCore/Entities/FoodEntity.cs
@@ -2,7 +2,7 @@
 
 namespace SampleWebApiAspNetCore.Entities
 {
-    public class FoodItem
+    public class FoodEntity
     {
         public int Id { get; set; }
         public string Name { get; set; }
diff --git a/SampleWebApiAspNetCore/MappingProfiles/FoodMappings.cs b/SampleWebApiAspNetCore/MappingProfiles/FoodMappings.cs
@@ -8,9 +8,9 @@ public class FoodMappings : Profile
     {
         public FoodMappings()
         {
-            CreateMap<FoodItem, FoodItemDto>().ReverseMap();
-            CreateMap<FoodItem, FoodUpdateDto>().ReverseMap();
-            CreateMap<FoodItem, FoodCreateDto>().ReverseMap();
+            CreateMap<FoodEntity, FoodDto>().ReverseMap();
+            CreateMap<FoodEntity, FoodUpdateDto>().ReverseMap();
+            CreateMap<FoodEntity, FoodCreateDto>().ReverseMap();
         }
     }
 }
diff --git a/SampleWebApiAspNetCore/Repositories/FoodDbContext.cs b/SampleWebApiAspNetCore/Repositories/FoodDbContext.cs
@@ -11,7 +11,7 @@ public FoodDbContext(DbContextOptions<FoodDbContext> options)
 
         }
 
-        public DbSet<FoodItem> FoodItems { get; set; }
+        public DbSet<FoodEntity> FoodItems { get; set; }
 
     }
 }
diff --git a/SampleWebApiAspNetCore/Repositories/FoodSqlRepository.cs b/SampleWebApiAspNetCore/Repositories/FoodSqlRepository.cs
@@ -17,31 +17,31 @@ public FoodSqlRepository(FoodDbContext foodDbContext)
             _foodDbContext = foodDbContext;
         }
 
-        public FoodItem GetSingle(int id)
+        public FoodEntity GetSingle(int id)
         {
             return _foodDbContext.FoodItems.FirstOrDefault(x => x.Id == id);
         }
 
-        public void Add(FoodItem item)
+        public void Add(FoodEntity item)
         {
             _foodDbContext.FoodItems.Add(item);
         }
 
         public void Delete(int id)
         {
-            FoodItem foodItem = GetSingle(id);
+            FoodEntity foodItem = GetSingle(id);
             _foodDbContext.FoodItems.Remove(foodItem);
         }
 
-        public FoodItem Update(int id, FoodItem item)
+        public FoodEntity Update(int id, FoodEntity item)
         {
             _foodDbContext.FoodItems.Update(item);
             return item;
         }
 
-        public IQueryable<FoodItem> GetAll(QueryParameters queryParameters)
+        public IQueryable<FoodEntity> GetAll(QueryParameters queryParameters)
         {
-            IQueryable<FoodItem> _allItems = _foodDbContext.FoodItems.OrderBy(queryParameters.OrderBy,
+            IQueryable<FoodEntity> _allItems = _foodDbContext.FoodItems.OrderBy(queryParameters.OrderBy,
               queryParameters.IsDescending());
 
             if (queryParameters.HasQuery())
@@ -66,9 +66,9 @@ public bool Save()
             return (_foodDbContext.SaveChanges() >= 0);
         }
 
-        public ICollection<FoodItem> GetRandomMeal()
+        public ICollection<FoodEntity> GetRandomMeal()
         {
-            List<FoodItem> toReturn = new List<FoodItem>();
+            List<FoodEntity> toReturn = new List<FoodEntity>();
 
             toReturn.Add(GetRandomItem("Starter"));
             toReturn.Add(GetRandomItem("Main"));
@@ -77,7 +77,7 @@ public ICollection<FoodItem> GetRandomMeal()
             return toReturn;
         }
 
-        private FoodItem GetRandomItem(string type)
+        private FoodEntity GetRandomItem(string type)
         {
             return _foodDbContext.FoodItems
                 .Where(x => x.Type == type)
diff --git a/SampleWebApiAspNetCore/Repositories/IFoodRepository.cs b/SampleWebApiAspNetCore/Repositories/IFoodRepository.cs
@@ -7,13 +7,13 @@ namespace SampleWebApiAspNetCore.Repositories
 {
     public interface IFoodRepository
     {
-        FoodItem GetSingle(int id);
-        void Add(FoodItem item);
+        FoodEntity GetSingle(int id);
+        void Add(FoodEntity item);
         void Delete(int id);
-        FoodItem Update(int id, FoodItem item);
-        IQueryable<FoodItem> GetAll(QueryParameters queryParameters);
+        FoodEntity Update(int id, FoodEntity item);
+        IQueryable<FoodEntity> GetAll(QueryParameters queryParameters);
 
-        ICollection<FoodItem> GetRandomMeal();
+        ICollection<FoodEntity> GetRandomMeal();
         int Count();
 
         bool Save();
diff --git a/SampleWebApiAspNetCore/SampleWebApiAspNetCore.csproj b/SampleWebApiAspNetCore/SampleWebApiAspNetCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
@@ -12,17 +12,17 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.0.0-preview8.19405.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.0.0-preview8.19405.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc3" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.19" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/SampleWebApiAspNetCore/Services/SeedDataService.cs b/SampleWebApiAspNetCore/Services/SeedDataService.cs
@@ -9,10 +9,10 @@ public class SeedDataService : ISeedDataService
     {
         public async Task Initialize(FoodDbContext context)
         {
-            context.FoodItems.Add(new FoodItem() { Calories = 1000, Type = "Starter", Name = "Lasagne", Created = DateTime.Now });
-            context.FoodItems.Add(new FoodItem() { Calories = 1100, Type = "Main", Name = "Hamburger", Created = DateTime.Now });
-            context.FoodItems.Add(new FoodItem() { Calories = 1200, Type = "Dessert", Name = "Spaghetti", Created = DateTime.Now });
-            context.FoodItems.Add(new FoodItem() { Calories = 1300, Type = "Starter", Name = "Pizza", Created = DateTime.Now });
+            context.FoodItems.Add(new FoodEntity() { Calories = 1000, Type = "Starter", Name = "Lasagne", Created = DateTime.Now });
+            context.FoodItems.Add(new FoodEntity() { Calories = 1100, Type = "Main", Name = "Hamburger", Created = DateTime.Now });
+            context.FoodItems.Add(new FoodEntity() { Calories = 1200, Type = "Dessert", Name = "Spaghetti", Created = DateTime.Now });
+            context.FoodItems.Add(new FoodEntity() { Calories = 1300, Type = "Starter", Name = "Pizza", Created = DateTime.Now });
 
             await context.SaveChangesAsync();
         }
diff --git a/SampleWebApiAspNetCore/Startup.cs b/SampleWebApiAspNetCore/Startup.cs

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class FoodsController : ControllerBase`
`23`	`23`	`private readonly IMapper _mapper;`
`24`	`24`
`25`	`25`	`public FoodsController(`
`26`		`- IUrlHelper urlHelper,`
	`26`	`+ IUrlHelper urlHelper,`
`27`	`27`	`IFoodRepository foodRepository,`
`28`	`28`	`IMapper mapper)`
`29`	`29`	`{`
`@@ -33,9 +33,9 @@ public FoodsController(`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[HttpGet(Name = nameof(GetAllFoods))]`
`36`		`- public ActionResult GetAllFoods([FromQuery] QueryParameters queryParameters)`
	`36`	`+ public ActionResult GetAllFoods(ApiVersion version, [FromQuery] QueryParameters queryParameters)`
`37`	`37`	`{`
`38`		`- List<FoodItem> foodItems = _foodRepository.GetAll(queryParameters).ToList();`
	`38`	`+ List<FoodEntity> foodItems = _foodRepository.GetAll(queryParameters).ToList();`
`39`	`39`
`40`	`40`	`var allItemCount = _foodRepository.Count();`
`41`	`41`
`@@ -50,9 +50,9 @@ public ActionResult GetAllFoods([FromQuery] QueryParameters queryParameters)`
`50`	`50`	`Response.Headers.Add("X-Pagination",`
`51`	`51`	`Newtonsoft.Json.JsonConvert.SerializeObject(paginationMetadata));`
`52`	`52`
`53`		`- var links = CreateLinksForCollection(queryParameters, allItemCount);`
	`53`	`+ var links = CreateLinksForCollection(queryParameters, allItemCount, version);`
`54`	`54`
`55`		`- var toReturn = foodItems.Select(x => ExpandSingleFoodItem(x));`
	`55`	`+ var toReturn = foodItems.Select(x => ExpandSingleFoodItem(x, version));`
`56`	`56`
`57`	`57`	`return Ok(new`
`58`	`58`	`{`
`@@ -63,27 +63,27 @@ public ActionResult GetAllFoods([FromQuery] QueryParameters queryParameters)`
`63`	`63`
`64`	`64`	`[HttpGet]`
`65`	`65`	`[Route("{id:int}", Name = nameof(GetSingleFood))]`
`66`		`- public ActionResult GetSingleFood(int id)`
	`66`	`+ public ActionResult GetSingleFood(ApiVersion version, int id)`
`67`	`67`	`{`
`68`		`- FoodItem foodItem = _foodRepository.GetSingle(id);`
	`68`	`+ FoodEntity foodItem = _foodRepository.GetSingle(id);`
`69`	`69`
`70`	`70`	`if (foodItem == null)`
`71`	`71`	`{`
`72`	`72`	`return NotFound();`
`73`	`73`	`}`
`74`	`74`
`75`		`- return Ok(ExpandSingleFoodItem(foodItem));`
	`75`	`+ return Ok(ExpandSingleFoodItem(foodItem, version));`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`[HttpPost(Name = nameof(AddFood))]`
`79`		`- public ActionResult<FoodItemDto> AddFood([FromBody] FoodCreateDto foodCreateDto)`
	`79`	`+ public ActionResult<FoodDto> AddFood(ApiVersion version, [FromBody] FoodCreateDto foodCreateDto)`
`80`	`80`	`{`
`81`	`81`	`if (foodCreateDto == null)`
`82`	`82`	`{`
`83`	`83`	`return BadRequest();`
`84`	`84`	`}`
`85`	`85`
`86`		`- FoodItem toAdd = _mapper.Map<FoodItem>(foodCreateDto);`
	`86`	`+ FoodEntity toAdd = _mapper.Map<FoodEntity>(foodCreateDto);`
`87`	`87`
`88`	`88`	`_foodRepository.Add(toAdd);`
`89`	`89`
`@@ -92,21 +92,21 @@ public ActionResult<FoodItemDto> AddFood([FromBody] FoodCreateDto foodCreateDto)`
`92`	`92`	`throw new Exception("Creating a fooditem failed on save.");`
`93`	`93`	`}`
`94`	`94`
`95`		`- FoodItem newFoodItem = _foodRepository.GetSingle(toAdd.Id);`
	`95`	`+ FoodEntity newFoodItem = _foodRepository.GetSingle(toAdd.Id);`
`96`	`96`
`97`		`- return CreatedAtRoute(nameof(GetSingleFood), new { id = newFoodItem.Id },`
`98`		`- _mapper.Map<FoodItemDto>(newFoodItem));`
	`97`	`+ return CreatedAtRoute(nameof(GetSingleFood), new { version = version.ToString(), id = newFoodItem.Id },`
	`98`	`+ _mapper.Map<FoodDto>(newFoodItem));`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`[HttpPatch("{id:int}", Name = nameof(PartiallyUpdateFood))]`
`102`		`- public ActionResult<FoodItemDto> PartiallyUpdateFood(int id, [FromBody] JsonPatchDocument<FoodUpdateDto> patchDoc)`
	`102`	`+ public ActionResult<FoodDto> PartiallyUpdateFood(int id, [FromBody] JsonPatchDocument<FoodUpdateDto> patchDoc)`
`103`	`103`	`{`
`104`	`104`	`if (patchDoc == null)`
`105`	`105`	`{`
`106`	`106`	`return BadRequest();`
`107`	`107`	`}`
`108`	`108`
`109`		`- FoodItem existingEntity = _foodRepository.GetSingle(id);`
	`109`	`+ FoodEntity existingEntity = _foodRepository.GetSingle(id);`
`110`	`110`
`111`	`111`	`if (existingEntity == null)`
`112`	`112`	`{`
`@@ -124,21 +124,21 @@ public ActionResult<FoodItemDto> PartiallyUpdateFood(int id, [FromBody] JsonPatc`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`_mapper.Map(foodUpdateDto, existingEntity);`
`127`		`- FoodItem updated = _foodRepository.Update(id, existingEntity);`
	`127`	`+ FoodEntity updated = _foodRepository.Update(id, existingEntity);`
`128`	`128`
`129`	`129`	`if (!_foodRepository.Save())`
`130`	`130`	`{`
`131`	`131`	`throw new Exception("Updating a fooditem failed on save.");`
`132`	`132`	`}`
`133`	`133`
`134`		`- return Ok(_mapper.Map<FoodItemDto>(updated));`
	`134`	`+ return Ok(_mapper.Map<FoodDto>(updated));`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`[HttpDelete]`
`138`	`138`	`[Route("{id:int}", Name = nameof(RemoveFood))]`
`139`	`139`	`public ActionResult RemoveFood(int id)`
`140`	`140`	`{`
`141`		`- FoodItem foodItem = _foodRepository.GetSingle(id);`
	`141`	`+ FoodEntity foodItem = _foodRepository.GetSingle(id);`
`142`	`142`
`143`	`143`	`if (foodItem == null)`
`144`	`144`	`{`
`@@ -157,7 +157,7 @@ public ActionResult RemoveFood(int id)`
`157`	`157`
`158`	`158`	`[HttpPut]`
`159`	`159`	`[Route("{id:int}", Name = nameof(UpdateFood))]`
`160`		`- public ActionResult<FoodItemDto> UpdateFood(int id, [FromBody]FoodUpdateDto foodUpdateDto)`
	`160`	`+ public ActionResult<FoodDto> UpdateFood(int id, [FromBody]FoodUpdateDto foodUpdateDto)`
`161`	`161`	`{`
`162`	`162`	`if (foodUpdateDto == null)`
`163`	`163`	`{`
`@@ -180,16 +180,16 @@ public ActionResult<FoodItemDto> UpdateFood(int id, [FromBody]FoodUpdateDto food`
`180`	`180`	`throw new Exception("Updating a fooditem failed on save.");`
`181`	`181`	`}`
`182`	`182`
`183`		`- return Ok(_mapper.Map<FoodItemDto>(existingFoodItem));`
	`183`	`+ return Ok(_mapper.Map<FoodDto>(existingFoodItem));`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`[HttpGet("GetRandomMeal", Name = nameof(GetRandomMeal))]`
`187`	`187`	`public ActionResult GetRandomMeal()`
`188`	`188`	`{`
`189`		`- ICollection<FoodItem> foodItems = _foodRepository.GetRandomMeal();`
	`189`	`+ ICollection<FoodEntity> foodItems = _foodRepository.GetRandomMeal();`
`190`	`190`
`191`		`- IEnumerable<FoodItemDto> dtos = foodItems`
`192`		`- .Select(x => _mapper.Map<FoodItemDto>(x));`
	`191`	`+ IEnumerable<FoodDto> dtos = foodItems`
	`192`	`+ .Select(x => _mapper.Map<FoodDto>(x));`
`193`	`193`
`194`	`194`	`var links = new List<LinkDto>();`
`195`	`195`
`@@ -203,7 +203,7 @@ public ActionResult GetRandomMeal()`
`203`	`203`	`});`
`204`	`204`	`}`
`205`	`205`
`206`		`- private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters, int totalCount)`
	`206`	`+ private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters, int totalCount, ApiVersion version)`
`207`	`207`	`{`
`208`	`208`	`var links = new List<LinkDto>();`
`209`	`209`
`@@ -249,46 +249,54 @@ private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters,`
`249`	`249`	`}), "previous", "GET"));`
`250`	`250`	`}`
`251`	`251`
	`252`	`+ var posturl = _urlHelper.Link(nameof(AddFood), new { version = version.ToString() });`
	`253`	`+`
`252`	`254`	`links.Add(`
`253`		`- new LinkDto(_urlHelper.Link(nameof(AddFood), null),`
	`255`	`+ new LinkDto(posturl,`
`254`	`256`	`"create_food",`
`255`	`257`	`"POST"));`
`256`	`258`
`257`	`259`	`return links;`
`258`	`260`	`}`
`259`	`261`
`260`		`- private dynamic ExpandSingleFoodItem(FoodItem foodItem)`
	`262`	`+ private dynamic ExpandSingleFoodItem(FoodEntity foodItem, ApiVersion version)`
`261`	`263`	`{`
`262`		`- var links = GetLinks(foodItem.Id);`
`263`		`- FoodItemDto item = _mapper.Map<FoodItemDto>(foodItem);`
	`264`	`+ var links = GetLinks(foodItem.Id, version);`
	`265`	`+ FoodDto item = _mapper.Map<FoodDto>(foodItem);`
`264`	`266`
`265`	`267`	`var resourceToReturn = item.ToDynamic() as IDictionary<string, object>;`
`266`	`268`	`resourceToReturn.Add("links", links);`
`267`	`269`
`268`	`270`	`return resourceToReturn;`
`269`	`271`	`}`
`270`	`272`
`271`		`- private IEnumerable<LinkDto> GetLinks(int id)`
	`273`	`+ private IEnumerable<LinkDto> GetLinks(int id, ApiVersion version)`
`272`	`274`	`{`
`273`	`275`	`var links = new List<LinkDto>();`
`274`	`276`
	`277`	`+ var getLink = _urlHelper.Link(nameof(GetSingleFood), new { version = version.ToString(), id = id });`
	`278`	`+`
`275`	`279`	`links.Add(`
`276`		`- new LinkDto(_urlHelper.Link(nameof(GetSingleFood), new { id = id }),`
`277`		`- "self",`
`278`		`- "GET"));`
	`280`	`+ new LinkDto(getLink, "self", "GET"));`
	`281`	`+`
	`282`	`+ var deleteLink = _urlHelper.Link(nameof(RemoveFood), new { version = version.ToString(), id = id });`
`279`	`283`
`280`	`284`	`links.Add(`
`281`		`- new LinkDto(_urlHelper.Link(nameof(RemoveFood), new { id = id }),`
	`285`	`+ new LinkDto(deleteLink,`
`282`	`286`	`"delete_food",`
`283`	`287`	`"DELETE"));`
`284`	`288`
	`289`	`+ var createLink = _urlHelper.Link(nameof(AddFood), new { version = version.ToString() });`
	`290`	`+`
`285`	`291`	`links.Add(`
`286`		`- new LinkDto(_urlHelper.Link(nameof(AddFood), null),`
	`292`	`+ new LinkDto(createLink,`
`287`	`293`	`"create_food",`
`288`	`294`	`"POST"));`
`289`	`295`
	`296`	`+ var updateLink = _urlHelper.Link(nameof(UpdateFood), new { version = version.ToString(), id = id });`
	`297`	`+`
`290`	`298`	`links.Add(`
`291`		`- new LinkDto(_urlHelper.Link(nameof(UpdateFood), new { id = id }),`
	`299`	`+ new LinkDto(updateLink,`
`292`	`300`	`"update_food",`
`293`	`301`	`"PUT"));`
`294`	`302`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace SampleWebApiAspNetCore.Dtos`
`4`	`4`	`{`
`5`		`- public class FoodItemDto`
	`5`	`+ public class FoodDto`
`6`	`6`	`{`
`7`	`7`	`public int Id { get; set; }`
`8`	`8`	`public string Name { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace SampleWebApiAspNetCore.Entities`
`4`	`4`	`{`
`5`		`- public class FoodItem`
	`5`	`+ public class FoodEntity`
`6`	`6`	`{`
`7`	`7`	`public int Id { get; set; }`
`8`	`8`	`public string Name { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ public class FoodMappings : Profile`
`8`	`8`	`{`
`9`	`9`	`public FoodMappings()`
`10`	`10`	`{`
`11`		`- CreateMap<FoodItem, FoodItemDto>().ReverseMap();`
`12`		`- CreateMap<FoodItem, FoodUpdateDto>().ReverseMap();`
`13`		`- CreateMap<FoodItem, FoodCreateDto>().ReverseMap();`
	`11`	`+ CreateMap<FoodEntity, FoodDto>().ReverseMap();`
	`12`	`+ CreateMap<FoodEntity, FoodUpdateDto>().ReverseMap();`
	`13`	`+ CreateMap<FoodEntity, FoodCreateDto>().ReverseMap();`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public FoodDbContext(DbContextOptions<FoodDbContext> options)`
`11`	`11`
`12`	`12`	`}`
`13`	`13`
`14`		`- public DbSet<FoodItem> FoodItems { get; set; }`
	`14`	`+ public DbSet<FoodEntity> FoodItems { get; set; }`
`15`	`15`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,31 +17,31 @@ public FoodSqlRepository(FoodDbContext foodDbContext)`
`17`	`17`	`_foodDbContext = foodDbContext;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public FoodItem GetSingle(int id)`
	`20`	`+ public FoodEntity GetSingle(int id)`
`21`	`21`	`{`
`22`	`22`	`return _foodDbContext.FoodItems.FirstOrDefault(x => x.Id == id);`
`23`	`23`	`}`
`24`	`24`
`25`		`- public void Add(FoodItem item)`
	`25`	`+ public void Add(FoodEntity item)`
`26`	`26`	`{`
`27`	`27`	`_foodDbContext.FoodItems.Add(item);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public void Delete(int id)`
`31`	`31`	`{`
`32`		`- FoodItem foodItem = GetSingle(id);`
	`32`	`+ FoodEntity foodItem = GetSingle(id);`
`33`	`33`	`_foodDbContext.FoodItems.Remove(foodItem);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public FoodItem Update(int id, FoodItem item)`
	`36`	`+ public FoodEntity Update(int id, FoodEntity item)`
`37`	`37`	`{`
`38`	`38`	`_foodDbContext.FoodItems.Update(item);`
`39`	`39`	`return item;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public IQueryable<FoodItem> GetAll(QueryParameters queryParameters)`
	`42`	`+ public IQueryable<FoodEntity> GetAll(QueryParameters queryParameters)`
`43`	`43`	`{`
`44`		`- IQueryable<FoodItem> _allItems = _foodDbContext.FoodItems.OrderBy(queryParameters.OrderBy,`
	`44`	`+ IQueryable<FoodEntity> _allItems = _foodDbContext.FoodItems.OrderBy(queryParameters.OrderBy,`
`45`	`45`	`queryParameters.IsDescending());`
`46`	`46`
`47`	`47`	`if (queryParameters.HasQuery())`
`@@ -66,9 +66,9 @@ public bool Save()`
`66`	`66`	`return (_foodDbContext.SaveChanges() >= 0);`
`67`	`67`	`}`
`68`	`68`
`69`		`- public ICollection<FoodItem> GetRandomMeal()`
	`69`	`+ public ICollection<FoodEntity> GetRandomMeal()`
`70`	`70`	`{`
`71`		`- List<FoodItem> toReturn = new List<FoodItem>();`
	`71`	`+ List<FoodEntity> toReturn = new List<FoodEntity>();`
`72`	`72`
`73`	`73`	`toReturn.Add(GetRandomItem("Starter"));`
`74`	`74`	`toReturn.Add(GetRandomItem("Main"));`
`@@ -77,7 +77,7 @@ public ICollection<FoodItem> GetRandomMeal()`
`77`	`77`	`return toReturn;`
`78`	`78`	`}`
`79`	`79`
`80`		`- private FoodItem GetRandomItem(string type)`
	`80`	`+ private FoodEntity GetRandomItem(string type)`
`81`	`81`	`{`
`82`	`82`	`return _foodDbContext.FoodItems`
`83`	`83`	`.Where(x => x.Type == type)`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ public class SeedDataService : ISeedDataService`
`9`	`9`	`{`
`10`	`10`	`public async Task Initialize(FoodDbContext context)`
`11`	`11`	`{`
`12`		`- context.FoodItems.Add(new FoodItem() { Calories = 1000, Type = "Starter", Name = "Lasagne", Created = DateTime.Now });`
`13`		`- context.FoodItems.Add(new FoodItem() { Calories = 1100, Type = "Main", Name = "Hamburger", Created = DateTime.Now });`
`14`		`- context.FoodItems.Add(new FoodItem() { Calories = 1200, Type = "Dessert", Name = "Spaghetti", Created = DateTime.Now });`
`15`		`- context.FoodItems.Add(new FoodItem() { Calories = 1300, Type = "Starter", Name = "Pizza", Created = DateTime.Now });`
	`12`	`+ context.FoodItems.Add(new FoodEntity() { Calories = 1000, Type = "Starter", Name = "Lasagne", Created = DateTime.Now });`
	`13`	`+ context.FoodItems.Add(new FoodEntity() { Calories = 1100, Type = "Main", Name = "Hamburger", Created = DateTime.Now });`
	`14`	`+ context.FoodItems.Add(new FoodEntity() { Calories = 1200, Type = "Dessert", Name = "Spaghetti", Created = DateTime.Now });`
	`15`	`+ context.FoodItems.Add(new FoodEntity() { Calories = 1300, Type = "Starter", Name = "Pizza", Created = DateTime.Now });`
`16`	`16`
`17`	`17`	`await context.SaveChangesAsync();`
`18`	`18`	`}`