Merge branch 'master' into Feature/MigrationTo3.1 (#9)

* Migrate the package to the version of Easify

* Remove the template file from WebApi project

* Fix the integration test template

* Upgrade to the latest version of EF

* Fix the wrong logging message

Author: moattarwork

src/content/api/src/Easify.Template.Client/Easify.Template.Client.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/content/api/src/Easify.Template.Client/SampleClient.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Easify.RestEase.Client;
+using Easify.Template.Common;
+using RestEase;
+
+namespace Easify.Template.Client
+{
+    public interface ISampleClient : IRestClient
+    {
+        [Get("api/samples")]
+        Task<IEnumerable<SampleDto>> GetSampleListAsync();
+    }
+}

src/content/api/src/Easify.Template.Common/Easify.Template.Common.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
 </Project>

src/content/api/src/Easify.Template.Common/SampleDto.cs

@@ -0,0 +1,7 @@
+namespace Easify.Template.Common
+{
+    public class SampleDto
+    {
+        public string Name { get; set; }
+    }
+}

src/content/api/src/Easify.Template.Core.UnitTests/Easify.Template.Core.UnitTests.csproj

@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Easify.Ef.Testing" Version="1.0.7" />
-    <PackageReference Include="Easify.Testing" Version="3.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Easify.Ef.Testing" Version="3.0.9" />
+    <PackageReference Include="Easify.Testing" Version="3.0.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

src/content/api/src/Easify.Template.Core/Easify.Template.Core.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,10 +12,13 @@
 
   <ItemGroup>
     <PackageReference Include="MediatR" Version="9.0.0" />
-    <PackageReference Include="Easify" Version="3.0.1" />
-    <PackageReference Include="Easify.Ef" Version="1.0.7" />
-    <PackageReference Include="Easify.RestEase.Client" Version="3.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
+    <PackageReference Include="Easify" Version="3.0.4" />
+    <PackageReference Include="Easify.Ef" Version="3.0.9" />
+    <PackageReference Include="Easify.RestEase.Client" Version="3.0.4" />
  </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Easify.Template.Common\Easify.Template.Common.csproj" />
+  </ItemGroup>
+
 </Project>

src/content/api/src/Easify.Template.Core/Handlers/SampleRequest.cs

@@ -0,0 +1,8 @@
+using MediatR;
+
+namespace Easify.Template.Core.Handlers
+{
+    public class SampleRequest : IRequest<SampleRequestResult>
+    {
+    }
+}

src/content/api/src/Easify.Template.Core/Handlers/SampleRequestHandler.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Easify.Template.Core.Data;
+using Easify.Template.Core.Shared.Domain;
+using EfCore.UnitOfWork;
+using MediatR;
+using Microsoft.Extensions.Logging;
+
+namespace Easify.Template.Core.Handlers
+{
+    public class SampleRequestHandler : IRequestHandler<SampleRequest, SampleRequestResult>
+    {
+        private readonly IUnitOfWork<AppDbContext> _unitOfWork;
+        private readonly ILogger<SampleRequestHandler> _logger;
+
+        public SampleRequestHandler(IUnitOfWork<AppDbContext> unitOfWork, ILogger<SampleRequestHandler> logger)
+        {
+            _unitOfWork = unitOfWork ?? throw new ArgumentNullException(nameof(unitOfWork));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public async Task<SampleRequestResult> Handle(SampleRequest request, CancellationToken cancellationToken)
+        {
+            try
+            {
+                _logger.LogInformation($"Loading the list of samples");
+                var samples = await LoadSamplesAsync();
+                
+                return SampleRequestResult.Success(samples);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError("Error in loading samples", e);
+                return SampleRequestResult.Fail(e.Message);
+            }
+        }
+
+        private static Task<IEnumerable<Sample>> LoadSamplesAsync()
+        {
+            return Task.FromResult(new[] {new Sample("Sample #1"), new Sample("Sample #2")}.AsEnumerable());
+        }
+    }
+}

src/content/api/src/Easify.Template.Core/Handlers/SampleRequestResult.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using Easify.Template.Core.Shared.Domain;
+
+namespace Easify.Template.Core.Handlers
+{
+    public class SampleRequestResult
+    {
+        public IEnumerable<Sample> Samples { get; private set; } = new Sample[] { };
+        public bool HasError { get; private set; }
+        public string ErrorMessage { get; private set; } = "";
+
+        public static SampleRequestResult Fail(string message)
+        {
+            return new SampleRequestResult {ErrorMessage = message, HasError = true};
+        }
+
+        public static SampleRequestResult Success(IEnumerable<Sample> samples)
+        {
+            return new SampleRequestResult {ErrorMessage = string.Empty, HasError = false, Samples = samples};
+        }
+    }
+}