Skip to content

Commit 2db0a6e

Browse files
FabianGosebrinkFabianGosebrink
committed
updated to the latest versions
1 parent 19e66d4 commit 2db0a6e

24 files changed

+156
-327
lines changed

‎SampleWebApiAspNetCore.sln‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29318.209
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.2.32616.157
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApiAspNetCore", "SampleWebApiAspNetCore\SampleWebApiAspNetCore.csproj", "{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleWebApiAspNetCore", "SampleWebApiAspNetCore\SampleWebApiAspNetCore.csproj", "{36DF3175-0775-44CC-8708-5B67F2ED70FE}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{36DF3175-0775-44CC-8708-5B67F2ED70FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{36DF3175-0775-44CC-8708-5B67F2ED70FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{36DF3175-0775-44CC-8708-5B67F2ED70FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{36DF3175-0775-44CC-8708-5B67F2ED70FE}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
2222
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {34868541-E39B-446C-935B-C0F838B5DEC3}
23+
SolutionGuid = {FFE92053-3580-432E-981F-30657B3AF39A}
2424
EndGlobalSection
2525
EndGlobal

‎SampleWebApiAspNetCore/.vscode/launch.json‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎SampleWebApiAspNetCore/.vscode/tasks.json‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎SampleWebApiAspNetCore/Controllers/v1/FoodsController.cs‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,29 @@
1-
using System;
2-
using System.Linq;
3-
using AutoMapper;
4-
using SampleWebApiAspNetCore.Dtos;
1+
using AutoMapper;
52
using Microsoft.AspNetCore.JsonPatch;
63
using Microsoft.AspNetCore.Mvc;
7-
using SampleWebApiAspNetCore.Repositories;
8-
using System.Collections.Generic;
4+
using SampleWebApiAspNetCore.Dtos;
95
using SampleWebApiAspNetCore.Entities;
10-
using SampleWebApiAspNetCore.Models;
116
using SampleWebApiAspNetCore.Helpers;
7+
using SampleWebApiAspNetCore.Models;
8+
using SampleWebApiAspNetCore.Repositories;
129
using System.Text.Json;
1310

14-
namespace SampleWebApiAspNetCore.v1.Controllers
11+
namespace SampleWebApiAspNetCore.Controllers.v1
1512
{
1613
[ApiController]
1714
[ApiVersion("1.0")]
1815
[Route("api/v{version:apiVersion}/[controller]")]
19-
//[Route("api/[controller]")]
2016
public class FoodsController : ControllerBase
2117
{
2218
private readonly IFoodRepository _foodRepository;
23-
private readonly IUrlHelper _urlHelper;
2419
private readonly IMapper _mapper;
2520

2621
public FoodsController(
27-
IUrlHelper urlHelper,
2822
IFoodRepository foodRepository,
2923
IMapper mapper)
3024
{
3125
_foodRepository = foodRepository;
3226
_mapper = mapper;
33-
_urlHelper = urlHelper;
3427
}
3528

3629
[HttpGet(Name = nameof(GetAllFoods))]
@@ -195,7 +188,7 @@ public ActionResult GetRandomMeal()
195188
var links = new List<LinkDto>();
196189

197190
// self
198-
links.Add(new LinkDto(_urlHelper.Link(nameof(GetRandomMeal), null), "self", "GET"));
191+
links.Add(new LinkDto(Url.Link(nameof(GetRandomMeal), null), "self", "GET"));
199192

200193
return Ok(new
201194
{
@@ -209,21 +202,21 @@ private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters,
209202
var links = new List<LinkDto>();
210203

211204
// self
212-
links.Add(new LinkDto(_urlHelper.Link(nameof(GetAllFoods), new
205+
links.Add(new LinkDto(Url.Link(nameof(GetAllFoods), new
213206
{
214207
pagecount = queryParameters.PageCount,
215208
page = queryParameters.Page,
216209
orderby = queryParameters.OrderBy
217210
}), "self", "GET"));
218211

219-
links.Add(new LinkDto(_urlHelper.Link(nameof(GetAllFoods), new
212+
links.Add(new LinkDto(Url.Link(nameof(GetAllFoods), new
220213
{
221214
pagecount = queryParameters.PageCount,
222215
page = 1,
223216
orderby = queryParameters.OrderBy
224217
}), "first", "GET"));
225218

226-
links.Add(new LinkDto(_urlHelper.Link(nameof(GetAllFoods), new
219+
links.Add(new LinkDto(Url.Link(nameof(GetAllFoods), new
227220
{
228221
pagecount = queryParameters.PageCount,
229222
page = queryParameters.GetTotalPages(totalCount),
@@ -232,7 +225,7 @@ private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters,
232225

233226
if (queryParameters.HasNext(totalCount))
234227
{
235-
links.Add(new LinkDto(_urlHelper.Link(nameof(GetAllFoods), new
228+
links.Add(new LinkDto(Url.Link(nameof(GetAllFoods), new
236229
{
237230
pagecount = queryParameters.PageCount,
238231
page = queryParameters.Page + 1,
@@ -242,15 +235,15 @@ private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters,
242235

243236
if (queryParameters.HasPrevious())
244237
{
245-
links.Add(new LinkDto(_urlHelper.Link(nameof(GetAllFoods), new
238+
links.Add(new LinkDto(Url.Link(nameof(GetAllFoods), new
246239
{
247240
pagecount = queryParameters.PageCount,
248241
page = queryParameters.Page - 1,
249242
orderby = queryParameters.OrderBy
250243
}), "previous", "GET"));
251244
}
252245

253-
var posturl = _urlHelper.Link(nameof(AddFood), new { version = version.ToString() });
246+
var posturl = Url.Link(nameof(AddFood), new { version = version.ToString() });
254247

255248
links.Add(
256249
new LinkDto(posturl,
@@ -275,26 +268,26 @@ private IEnumerable<LinkDto> GetLinks(int id, ApiVersion version)
275268
{
276269
var links = new List<LinkDto>();
277270

278-
var getLink = _urlHelper.Link(nameof(GetSingleFood), new { version = version.ToString(), id = id });
271+
var getLink = Url.Link(nameof(GetSingleFood), new { version = version.ToString(), id = id });
279272

280273
links.Add(
281274
new LinkDto(getLink, "self", "GET"));
282275

283-
var deleteLink = _urlHelper.Link(nameof(RemoveFood), new { version = version.ToString(), id = id });
276+
var deleteLink = Url.Link(nameof(RemoveFood), new { version = version.ToString(), id = id });
284277

285278
links.Add(
286279
new LinkDto(deleteLink,
287280
"delete_food",
288281
"DELETE"));
289282

290-
var createLink = _urlHelper.Link(nameof(AddFood), new { version = version.ToString() });
283+
var createLink = Url.Link(nameof(AddFood), new { version = version.ToString() });
291284

292285
links.Add(
293286
new LinkDto(createLink,
294287
"create_food",
295288
"POST"));
296289

297-
var updateLink = _urlHelper.Link(nameof(UpdateFood), new { version = version.ToString(), id = id });
290+
var updateLink = Url.Link(nameof(UpdateFood), new { version = version.ToString(), id = id });
298291

299292
links.Add(
300293
new LinkDto(updateLink,

‎SampleWebApiAspNetCore/Controllers/v2/FoodsController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNetCore.Mvc;
22

3-
namespace SampleWebApiAspNetCore.v2.Controllers
3+
namespace SampleWebApiAspNetCore.Controllers.v2
44
{
55
[ApiController]
66
[ApiVersion("2.0")]

‎SampleWebApiAspNetCore/Dtos/FoodCreateDto.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel.DataAnnotations;
4-
using System.Linq;
5-
using System.Threading.Tasks;
1+
using System.ComponentModel.DataAnnotations;
62

73
namespace SampleWebApiAspNetCore.Dtos
84
{
95
public class FoodCreateDto
106
{
117
[Required]
12-
public string Name { get; set; }
13-
public string Type { get; set; }
8+
public string? Name { get; set; }
9+
public string? Type { get; set; }
1410
public int Calories { get; set; }
1511
public DateTime Created { get; set; }
1612
}

‎SampleWebApiAspNetCore/Dtos/FoodDto.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
using System;
2-
3-
namespace SampleWebApiAspNetCore.Dtos
1+
namespace SampleWebApiAspNetCore.Dtos
42
{
53
public class FoodDto
64
{
75
public int Id { get; set; }
8-
public string Name { get; set; }
9-
public string Type { get; set; }
6+
public string? Name { get; set; }
7+
public string? Type { get; set; }
108
public int Calories { get; set; }
119
public DateTime Created { get; set; }
1210
}

‎SampleWebApiAspNetCore/Dtos/FoodUpdateDto.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
1+

62
namespace SampleWebApiAspNetCore.Dtos
73
{
84
public class FoodUpdateDto
95
{
10-
public string Name { get; set; }
6+
public string? Name { get; set; }
117
public int Calories { get; set; }
12-
public string Type { get; set; }
8+
public string? Type { get; set; }
139
public DateTime Created { get; set; }
1410
}
1511
}

‎SampleWebApiAspNetCore/Entities/FoodEntity.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
using System;
2-
3-
namespace SampleWebApiAspNetCore.Entities
1+
namespace SampleWebApiAspNetCore.Entities
42
{
53
public class FoodEntity
64
{
75
public int Id { get; set; }
8-
public string Name { get; set; }
9-
public string Type { get; set; }
6+
public string? Name { get; set; }
7+
public string? Type { get; set; }
108
public int Calories { get; set; }
119
public DateTime Created { get; set; }
1210
}

‎SampleWebApiAspNetCore/Helpers/ExceptionExtension.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using Microsoft.AspNetCore.Builder;
2-
using Microsoft.AspNetCore.Diagnostics;
3-
using Microsoft.Extensions.Logging;
4-
using Microsoft.AspNetCore.Hosting;
5-
using Microsoft.AspNetCore.Http;
6-
using Microsoft.Extensions.Hosting;
1+
using Microsoft.AspNetCore.Diagnostics;
72

83
namespace SampleWebApiAspNetCore.Helpers
94
{

0 commit comments

Comments
 (0)