Merge pull request #13 from FabianGosebrink/updated-links--hateoas

improved hateoas

Author: FabianGosebrink

SampleWebApiAspNetCore/Controllers/v1/FoodsController.cs

@@ -8,6 +8,8 @@
 using SampleWebApiAspNetCore.Models;
 using SampleWebApiAspNetCore.Repositories;
 using System.Text.Json;
+using System;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace SampleWebApiAspNetCore.Controllers.v1
 {
@@ -91,14 +93,15 @@ public ActionResult<FoodDto> AddFood(ApiVersion version, [FromBody] FoodCreateDt
             }
 
             FoodEntity newFoodItem = _foodRepository.GetSingle(toAdd.Id);
+            FoodDto foodDto = _mapper.Map<FoodDto>(newFoodItem);
 
             return CreatedAtRoute(nameof(GetSingleFood),
                 new { version = version.ToString(), id = newFoodItem.Id },
-                _mapper.Map<FoodDto>(newFoodItem));
+                _linkService.ExpandSingleFoodItem(foodDto, foodDto.Id, version));
         }
 
         [HttpPatch("{id:int}", Name = nameof(PartiallyUpdateFood))]
-        public ActionResult<FoodDto> PartiallyUpdateFood(int id, [FromBody] JsonPatchDocument<FoodUpdateDto> patchDoc)
+        public ActionResult<FoodDto> PartiallyUpdateFood(ApiVersion version, int id, [FromBody] JsonPatchDocument<FoodUpdateDto> patchDoc)
         {
             if (patchDoc == null)
             {
@@ -130,7 +133,9 @@ public ActionResult<FoodDto> PartiallyUpdateFood(int id, [FromBody] JsonPatchDoc
                 throw new Exception("Updating a fooditem failed on save.");
             }
 
-            return Ok(_mapper.Map<FoodDto>(updated));
+            FoodDto foodDto = _mapper.Map<FoodDto>(updated);
+
+            return Ok(_linkService.ExpandSingleFoodItem(foodDto, foodDto.Id, version));
         }
 
         [HttpDelete]
@@ -156,7 +161,7 @@ public ActionResult RemoveFood(int id)
 
         [HttpPut]
         [Route("{id:int}", Name = nameof(UpdateFood))]
-        public ActionResult<FoodDto> UpdateFood(int id, [FromBody] FoodUpdateDto foodUpdateDto)
+        public ActionResult<FoodDto> UpdateFood(ApiVersion version, int id, [FromBody] FoodUpdateDto foodUpdateDto)
         {
             if (foodUpdateDto == null)
             {
@@ -179,7 +184,9 @@ public ActionResult<FoodDto> UpdateFood(int id, [FromBody] FoodUpdateDto foodUpd
                 throw new Exception("Updating a fooditem failed on save.");
             }
 
-            return Ok(_mapper.Map<FoodDto>(existingFoodItem));
+            FoodDto foodDto = _mapper.Map<FoodDto>(existingFoodItem);
+
+            return Ok(_linkService.ExpandSingleFoodItem(foodDto, foodDto.Id, version));
         }
 
         [HttpGet("GetRandomMeal", Name = nameof(GetRandomMeal))]