WIP

Author: JorgeCandeias

src/Learn.WebApp/Client/Learn.WebApp.Client.csproj

@@ -14,6 +14,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="8.13.1.21947">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Learn.WebApp/Client/LearnClient.cs

@@ -0,0 +1,34 @@
+using Learn.WebApp.Shared.CoursePath;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Threading.Tasks;
+
+namespace Learn.WebApp.Client
+{
+    public class LearnClient
+    {
+        private readonly HttpClient _client;
+
+        public LearnClient(HttpClient client)
+        {
+            _client = client ?? throw new ArgumentNullException(nameof(client));
+        }
+
+        public async Task<IEnumerable<CoursePathResponseModel>> GetCoursePathsAsync()
+        {
+            try
+            {
+                return await _client
+                    .GetFromJsonAsync<IEnumerable<CoursePathResponseModel>>("CoursePath")
+                    .ConfigureAwait(false);
+            }
+            catch (NotSupportedException ex)
+            {
+                /* todo */
+                throw;
+            }
+        }
+    }
+}

src/Learn.WebApp/Client/Pages/Admin/ListCoursePaths.razor

@@ -1,4 +1,14 @@
 @page "/admin/course-paths"
+@inject LearnClient Client
 
 <h1>Course Paths</h1>
 
+@if (_models != null)
+{
+    @foreach (var model in _models)
+    {
+        <div>
+            @model.Key
+        </div>
+    }
+}

src/Learn.WebApp/Client/Pages/Admin/ListCoursePaths.razor.cs

@@ -1,7 +1,18 @@
-namespace Learn.WebApp.Client.Pages.Admin
+using Learn.WebApp.Shared.CoursePath;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Learn.WebApp.Client.Pages.Admin
 {
     public partial class ListCoursePaths
     {
+        private IEnumerable<CoursePathResponseModel> _models = null!;
+
+        protected override async Task OnInitializedAsync()
+        {
+            _models = await Client.GetCoursePathsAsync().ConfigureAwait(true);
 
+            await base.OnInitializedAsync().ConfigureAwait(true);
+        }
     }
 }

src/Learn.WebApp/Client/Pages/FetchData.razor

@@ -37,11 +37,11 @@ else
 
 @code {
 
-    private WeatherForecast[]? forecasts;
+    private WeatherForecastModel[]? forecasts;
 
     protected override async Task OnInitializedAsync()
     {
-        forecasts = await Http.GetFromJsonAsync<WeatherForecast[]>("WeatherForecast");
+        forecasts = await Http.GetFromJsonAsync<WeatherForecastModel[]>("WeatherForecast");
     }
 
 }

src/Learn.WebApp/Client/Program.cs

@@ -15,6 +15,11 @@ public static async Task Main(string[] args)
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
+            builder.Services.AddHttpClient<LearnClient>(client =>
+            {
+                client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress);
+            });
+
             await builder.Build().RunAsync().ConfigureAwait(false);
         }
     }

src/Learn.WebApp/Server/AutoMapperProfile.cs

@@ -1,13 +1,21 @@
 using AutoMapper;
+using Learn.Server.Shared;
+using Learn.WebApp.Shared;
+using Learn.WebApp.Shared.CoursePath;
 
 namespace Learn.WebApp.Server
 {
     internal class AutoMapperProfile : Profile
     {
         public AutoMapperProfile()
         {
-            CreateMap<Shared.WeatherForecast, Learn.Server.Shared.WeatherForecast>().ReverseMap();
-            CreateMap<Shared.CoursePathApiModel, Learn.Server.Shared.CoursePath>().ReverseMap();
+            // request models to business models
+            CreateMap<WeatherForecastModel, WeatherForecast>();
+            CreateMap<CoursePathPostRequestModel, CoursePath>();
+            CreateMap<CoursePathDeleteRequestModel, CoursePath>();
+
+            // business models to response models
+            CreateMap<CoursePath, CoursePathResponseModel>();
         }
     }
 }

src/Learn.WebApp/Server/Controllers/CoursePathController.cs

@@ -2,7 +2,6 @@
 using Learn.Server.Data.Exceptions;
 using Learn.Server.Data.Repositories;
 using Learn.Server.Shared;
-using Learn.WebApp.Shared;
 using Learn.WebApp.Shared.Conflict;
 using Learn.WebApp.Shared.CoursePath;
 using Microsoft.AspNetCore.Mvc;
@@ -36,15 +35,15 @@ public CoursePathController(ILogger<CoursePathController> logger, ICoursePathRep
         }
 
         [HttpGet]
-        public async Task<ActionResult<IEnumerable<CoursePathApiModel>>> GetAllAsync(CancellationToken cancellationToken)
+        public async Task<ActionResult<IEnumerable<CoursePathResponseModel>>> GetAllAsync(CancellationToken cancellationToken)
         {
             var result = await _repository.GetAllAsync(cancellationToken).ConfigureAwait(false);
 
-            return Ok(_mapper.Map<IEnumerable<CoursePathApiModel>>(result));
+            return Ok(_mapper.Map<IEnumerable<CoursePathResponseModel>>(result));
         }
 
         [HttpGet("{key}")]
-        public async Task<ActionResult<CoursePathApiModel>> GetAsync([FromRoute, Required] Guid key)
+        public async Task<ActionResult<CoursePathResponseModel>> GetAsync([FromRoute, Required] Guid key)
         {
             // get the cached entity
             var result = await _factory.GetCoursePathGrain(key).GetAsync().ConfigureAwait(false);
@@ -53,12 +52,12 @@ public async Task<ActionResult<CoursePathApiModel>> GetAsync([FromRoute, Require
             if (result is null) return NotFound();
 
             // the entity exists
-            return Ok(_mapper.Map<CoursePathApiModel>(result));
+            return Ok(_mapper.Map<CoursePathResponseModel>(result));
         }
 
         [HttpPost]
         [SwaggerResponse(409, Type = typeof(ConflictApiResponseModel))]
-        public async Task<ActionResult<CoursePathApiModel>> PostAsync([FromBody, Required, DisallowNull] CoursePathApiModel input)
+        public async Task<ActionResult<CoursePathResponseModel>> PostAsync([FromBody, Required, DisallowNull] CoursePathPostRequestModel input)
         {
             // to keep the compiler happy
             if (input is null) return BadRequest();
@@ -115,7 +114,7 @@ public async Task<ActionResult<CoursePathApiModel>> PostAsync([FromBody, Require
                 });
             }
 
-            return Ok(_mapper.Map<CoursePathApiModel>(result));
+            return Ok(_mapper.Map<CoursePathResponseModel>(result));
         }
 
         [HttpDelete]

src/Learn.WebApp/Server/Controllers/WeatherForecastController.cs

@@ -23,14 +23,14 @@ public WeatherForecastController(IGrainFactory factory, IMapper mapper)
         }
 
         [HttpGet]
-        public async Task<ActionResult<IEnumerable<WeatherForecast>>> GetAsync()
+        public async Task<ActionResult<IEnumerable<WeatherForecastModel>>> GetAsync()
         {
             var forecasts = await _factory
                 .GetWeatherForecastGrain()
                 .GetAllAsync()
                 .ConfigureAwait(false);
 
-            var result = _mapper.Map<IEnumerable<WeatherForecast>>(forecasts);
+            var result = _mapper.Map<IEnumerable<WeatherForecastModel>>(forecasts);
 
             return Ok(result);
         }

…earn.WebApp/Shared/CoursePathApiModel.cs …CoursePath/CoursePathPostRequestModel.cssrc/Learn.WebApp/Shared/CoursePathApiModel.cs renamed to src/Learn.WebApp/Shared/CoursePath/CoursePathPostRequestModel.cs src/Learn.WebApp/Shared/CoursePathApiModel.cs renamed to src/Learn.WebApp/Shared/CoursePath/CoursePathPostRequestModel.cs

@@ -1,16 +1,16 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Learn.WebApp.Shared
+namespace Learn.WebApp.Shared.CoursePath
 {
-    public class CoursePathApiModel
+    public class CoursePathPostRequestModel
     {
         public Guid? Key { get; set; }
 
-        [Required, MaxLength(1000)]
+        [Required]
         public string? Name { get; set; }
 
-        [Required, MaxLength(1000)]
+        [Required]
         public string? Slug { get; set; }
 
         public Guid? Version { get; set; }