fixed MVC code access

liamkohncoffey · liamkohncoffey · commit d5fd8d2a920b · 2020-09-26T15:55:49.000+02:00
diff --git a/AdventureWorks.API.sln b/AdventureWorks.API.sln
@@ -28,6 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdventureWorks.Client", "So
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdventureWorks.Common", "Source\AdventureWorks.Common\AdventureWorks.Common.csproj", "{78787B84-7EA2-4D18-B276-9CDA7B17C4FC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdventureWorks.Domain", "Source\AdventureWorks.Domain\AdventureWorks.Domain.csproj", "{93107024-9A1B-431C-9CD1-4A48EB8FFD51}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -60,6 +62,10 @@ Global
 		{78787B84-7EA2-4D18-B276-9CDA7B17C4FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{78787B84-7EA2-4D18-B276-9CDA7B17C4FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{78787B84-7EA2-4D18-B276-9CDA7B17C4FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93107024-9A1B-431C-9CD1-4A48EB8FFD51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93107024-9A1B-431C-9CD1-4A48EB8FFD51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93107024-9A1B-431C-9CD1-4A48EB8FFD51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93107024-9A1B-431C-9CD1-4A48EB8FFD51}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -73,6 +79,7 @@ Global
 		{C6631DEC-7B3F-42E7-8659-92727CD8E918} = {EB2AA2DC-EDB4-47D2-B63B-05D92CABB774}
 		{E818CB1E-B31B-4100-BE26-CBC2BC592BB8} = {EB2AA2DC-EDB4-47D2-B63B-05D92CABB774}
 		{78787B84-7EA2-4D18-B276-9CDA7B17C4FC} = {637325EA-5158-4046-B167-80FE953C1F1F}
+		{93107024-9A1B-431C-9CD1-4A48EB8FFD51} = {637325EA-5158-4046-B167-80FE953C1F1F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {282EED39-786B-4C93-A944-B13FF9C78CDF}
diff --git a/Source/AdventureWorks.API/Controllers/PersonController.cs b/Source/AdventureWorks.API/Controllers/PersonController.cs
@@ -1,4 +1,6 @@
-﻿using System.Threading.Tasks;
+﻿using System.Threading;
+using System.Threading.Tasks;
+using AdventureWorks.Api.Extensions;
 using AdventureWorks.Service;
 using AdventureWorks.Service.Dtos.Collections;
 using Microsoft.AspNetCore.Authorization;
@@ -18,42 +20,42 @@ public PersonController(IAdventureWorksService adventureWorksService)
         }
 
         /// <summary>
-        /// This Get method returns a persons name
+        /// GET returns a persons name
         /// </summary>
         [HttpGet("Name")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<ActionResult> GetPersonsNameByBusinessId(int businessId)
+        public async Task<ActionResult> GetPersonsNameByBusinessId(int businessId, CancellationToken cancellation)
         {
-            var response = await _adventureWorksService.GetPersonsNameAsync(businessId);
+            var response = await _adventureWorksService.GetPersonsNameAsync(businessId, cancellation);
             if (response == null)
                 return NotFound($"Couldn't find the person for the given businessId {businessId}");
-            return Ok(response);
+            return Ok(response.Map());
         }
 
         /// <summary>
-        /// This Patch method Updates a persons Name
+        /// PATCH Updates a persons Name
         /// </summary>
         [HttpPatch("Name")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<ActionResult> UpdatePersonBybussinessId(int businessId, [FromBody] PersonNameBaseDto personName)
+        public async Task<ActionResult> UpdatePersonBybussinessId(int businessId, [FromBody] PersonNameBaseDto personName, CancellationToken cancellation)
         {
-            var response = await _adventureWorksService.PatchPersonsNameAsync(businessId, personName);
+            var response = await _adventureWorksService.PatchPersonsNameAsync(businessId, personName, cancellation);
             if (response == null)
                 return NotFound($"Couldn't find the person for the given businessId {businessId}");
-            return Ok(response);
+            return Ok(response.Map());
         }
             
         /// <summary>
-        /// This Gets a persons basic information
+        /// GET returns persons basic information
         /// </summary>
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<ActionResult> GetPersonByBusinessEntity(int businessId)
+        public async Task<ActionResult> GetPersonByBusinessEntity(int businessId, CancellationToken cancellation)
         {
-            var response = await _adventureWorksService.GetPersonAsync(businessId);
+            var response = await _adventureWorksService.GetPersonAsync(businessId, cancellation);
             if (response == null)
                 return NotFound($"Couldn't find the person for the given businessId {businessId}");
-            return Ok(response);
+            return Ok(response.Map());
         }
     }
 }
diff --git a/Source/AdventureWorks.API/Extensions/AdventureWorksMapperExtension.cs b/Source/AdventureWorks.API/Extensions/AdventureWorksMapperExtension.cs
@@ -0,0 +1,37 @@
+using System.Linq;
+using AdventureWorks.Domain.Response;
+using AdventureWorks.Service.Dtos.Collections;
+
+namespace AdventureWorks.Api.Extensions
+{
+    public static class AdventureWorksMapperExtension
+    {
+        public static PersonNameResponse Map(this PersonNameDto personName) => new PersonNameResponse
+        {
+            FirstName = personName.FullName,
+            LastName = personName.LastName,
+            LastUpdated = personName.LastUpdated,
+            MiddleName = personName.MiddleName
+        };
+        
+        public static PersonResponse Map(this PersonDto person) => new PersonResponse
+        {
+            FirstName = person.FullName,
+            LastName = person.LastName,
+            LastUpdated = person.LastUpdated,
+            MiddleName = person.MiddleName,
+            CreditCards = person.CreditCards.Select(c => new CreditCardResponse
+            {
+                CardNumber = c.CardNumber
+            }),
+            Emails = person.Emails.Select(c => new EmailResponse
+            {
+                Email = c.Email
+            }),
+            PhoneNumbers = person.PhoneNumbers.Select(c => new PhoneResponse
+            {
+                PhoneNumber = c.PhoneNumber
+            })
+        };
+    }
+}
diff --git a/Source/AdventureWorks.API/Startup.cs b/Source/AdventureWorks.API/Startup.cs
@@ -20,6 +20,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.IdentityModel.Tokens;
 using Newtonsoft.Json;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Swashbuckle.AspNetCore.SwaggerUI;
@@ -53,7 +54,11 @@ public void ConfigureServices(IServiceCollection services)
                 {
                     options.Authority = "http://localhost:5000";
                     options.RequireHttpsMetadata = false;
-                    options.Audience = "api1";
+                    options.TokenValidationParameters = new TokenValidationParameters
+                    {
+                        ValidateAudience = false
+                    };
+                   //options.Audience = "AdventureWorks.OAuth";
                 });
             
                 //Use this for Basic Authentiction
diff --git a/Source/AdventureWorks.Domain/AdventureWorks.Domain.csproj b/Source/AdventureWorks.Domain/AdventureWorks.Domain.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+</Project>
diff --git a/Source/AdventureWorks.Domain/Response/AdventureWorksResponse.cs b/Source/AdventureWorks.Domain/Response/AdventureWorksResponse.cs
@@ -0,0 +1,7 @@
+﻿namespace AdventureWorks.Domain.Response
+{
+    public class AdventureWorksResponse
+    {
+
+    }
+}
diff --git a/Source/AdventureWorks.Domain/Response/BusinessEntityResponse.cs b/Source/AdventureWorks.Domain/Response/BusinessEntityResponse.cs
@@ -0,0 +1,9 @@
+﻿namespace AdventureWorks.Domain.Response
+{
+    public class BusinessEntityResponse
+    {
+        public int BusinessEntityId { get; set; }
+        public int PersonId { get; set; }
+        public int ContactTypeId { get; set; }
+    }
+}
diff --git a/Source/AdventureWorks.Domain/Response/CreditCardResponse.cs b/Source/AdventureWorks.Domain/Response/CreditCardResponse.cs
@@ -0,0 +1,7 @@
+﻿namespace AdventureWorks.Domain.Response
+{
+    public class CreditCardResponse
+    {
+        public string CardNumber { get; set; }
+    }
+}
diff --git a/Source/AdventureWorks.Domain/Response/EmailResponse.cs b/Source/AdventureWorks.Domain/Response/EmailResponse.cs
@@ -0,0 +1,7 @@
+﻿namespace AdventureWorks.Domain.Response
+{
+    public class EmailResponse
+    {
+        public string Email { get; set; }
+    }
+}
diff --git a/Source/AdventureWorks.Domain/Response/PersonNameBaseResponse.cs b/Source/AdventureWorks.Domain/Response/PersonNameBaseResponse.cs
@@ -0,0 +1,9 @@
+﻿namespace AdventureWorks.Domain.Response
+{
+    public class PersonNameBaseResponse
+    {
+        public string FirstName { get; set; }
+        public string MiddleName { get; set; }
+        public string LastName { get; set; }
+    }
+}
diff --git a/Source/AdventureWorks.Domain/Response/PersonNameResponse.cs b/Source/AdventureWorks.Domain/Response/PersonNameResponse.cs
@@ -0,0 +1,22 @@
+﻿using System;
+
+namespace AdventureWorks.Domain.Response
+{
+    public class PersonNameResponse : PersonNameBaseResponse
+    {
+        public DateTime? LastUpdated { get; set; }
+        public string FullName => CreateFullName();
+
+        private string CreateFullName()
+        {
+            var fullName = "";
+            if (!string.IsNullOrEmpty(FirstName))
+                fullName += FirstName;
+            if(!string.IsNullOrEmpty(MiddleName))
+                fullName += string.IsNullOrEmpty(fullName) ? MiddleName : $" {MiddleName}";
+            if(!string.IsNullOrEmpty(LastName))
+                fullName += string.IsNullOrEmpty(LastName) ? LastName : $" {LastName}";
+            return fullName;
+        }
+    }
+}
diff --git a/Source/AdventureWorks.Domain/Response/PersonResponse.cs b/Source/AdventureWorks.Domain/Response/PersonResponse.cs
@@ -0,0 +1,11 @@
+﻿using System.Collections.Generic;
+
+namespace AdventureWorks.Domain.Response
+{
+    public class PersonResponse : PersonNameResponse
+    {
+        public IEnumerable<PhoneResponse> PhoneNumbers { get; set; }
+        public IEnumerable<CreditCardResponse> CreditCards { get; set; }
+        public IEnumerable<EmailResponse> Emails { get; set; }
+    }
+}
diff --git a/Source/AdventureWorks.Domain/Response/PhoneResponse.cs b/Source/AdventureWorks.Domain/Response/PhoneResponse.cs
@@ -0,0 +1,7 @@
+﻿namespace AdventureWorks.Domain.Response
+{
+    public class PhoneResponse
+    {
+        public string PhoneNumber { get; set; }
+    }
+}
diff --git a/Source/AdventureWorks.Service/AdventureWorks.Service.csproj b/Source/AdventureWorks.Service/AdventureWorks.Service.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\AdventureWorks.Domain\AdventureWorks.Domain.csproj" />
     <ProjectReference Include="..\Database\AdventureWorks.Client\AdventureWorks.Client.csproj" />
   </ItemGroup>
 
diff --git a/Source/AdventureWorks.Service/AdventureWorksService.cs b/Source/AdventureWorks.Service/AdventureWorksService.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AdventureWorks.Client;
 using AdventureWorks.Service.Dtos.Collections;
@@ -31,29 +32,29 @@ public AdventureWorksService(
 
         #endregion
 
-        public async Task<PersonNameDto> GetPersonsNameAsync(int businessEntityId)
+        public async Task<PersonNameDto> GetPersonsNameAsync(int businessEntityId, CancellationToken cancellation)
         {
-            var person = (await _repo.Person.Where(c => c.BusinessEntityId == businessEntityId).AsNoTracking().ToListAsync())
+            var person = (await _repo.Person.Where(c => c.BusinessEntityId == businessEntityId).AsNoTracking().ToListAsync(cancellation))
                 .FirstOrDefault();
             if (person == null)
                 return null;
             return _mapper.Map<PersonNameDto>(person);
         }
 
-        public async Task<PersonNameDto> PatchPersonsNameAsync(int businessEntityId, PersonNameBaseDto personNameDto)
+        public async Task<PersonNameDto> PatchPersonsNameAsync(int businessEntityId, PersonNameBaseDto personNameDto, CancellationToken cancellation)
         {
-            var person = (await _repo.Person.Where(c => c.BusinessEntityId == businessEntityId).ToListAsync()).FirstOrDefault();
+            var person = (await _repo.Person.Where(c => c.BusinessEntityId == businessEntityId).ToListAsync(cancellation)).FirstOrDefault();
             if (person == null)
                 return null;
             person.FirstName = personNameDto.FirstName;
             person.MiddleName = personNameDto.MiddleName;
             person.LastName = personNameDto.LastName;
             person.ModifiedDate = DateTime.UtcNow;  
-            _repo.SaveChanges();
+            await _repo.SaveChangesAsync(cancellation);
             return _mapper.Map<PersonNameDto>(person);  
         }
 
-        public async Task<PersonDto> GetPersonAsync(int businessEntityId)
+        public async Task<PersonDto> GetPersonAsync(int businessEntityId, CancellationToken cancellation)
         {
             var person = (await _repo.Person.Include(c => c.BusinessEntity).Include(c => c.EmailAddress)
                 .Include(c => c.BusinessEntityContact)
@@ -62,7 +63,7 @@ public async Task<PersonDto> GetPersonAsync(int businessEntityId)
                 .ThenInclude(c => c.CreditCard)
                 .Include(c => c.BusinessEntityContact)
                 .Include(c => c.Customer)
-                .Where(c => c.BusinessEntityId == businessEntityId).AsNoTracking().ToListAsync()).FirstOrDefault();
+                .Where(c => c.BusinessEntityId == businessEntityId).AsNoTracking().ToListAsync(cancellation)).FirstOrDefault();
             if (person == null)
                 return null;
             return _mapper.Map<PersonDto>(person);
diff --git a/Source/AdventureWorks.Service/IAdventureWorksService.cs b/Source/AdventureWorks.Service/IAdventureWorksService.cs
@@ -6,8 +6,9 @@ namespace AdventureWorks.Service
 {
     public interface IAdventureWorksService
     {
-        Task<PersonNameDto> GetPersonsNameAsync(int businessEntityId);
-        Task<PersonNameDto> PatchPersonsNameAsync(int businessEntityId, PersonNameBaseDto personNameDto);
-        Task<PersonDto> GetPersonAsync(int businessEntityId);
+        Task<PersonNameDto> GetPersonsNameAsync(int businessEntityId, CancellationToken cancellation);
+        Task<PersonNameDto> PatchPersonsNameAsync(int businessEntityId, PersonNameBaseDto personNameDto,
+            CancellationToken cancellation);
+        Task<PersonDto> GetPersonAsync(int businessEntityId, CancellationToken cancellation);
     }
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +namespace AdventureWorks.Domain.Response
 +{
 +    public class AdventureWorksResponse
 +    {
++
 +    }
 +}