Patch P32 整理using

Author: Surbowl

Routine/Routine.APi/Controllers/CompaniesController.cs

@@ -6,7 +6,6 @@
 using Routine.APi.Services;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 /*

Routine/Routine.APi/Controllers/EmployeesController.cs

@@ -1,6 +1,9 @@
 using AutoMapper;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Routine.APi.Entities;
 using Routine.APi.Models;
 using Routine.APi.Services;
@@ -168,20 +171,56 @@ public async Task<IActionResult> PartiallyUpdateEmployeeForCompany(Guid companyI
             var employeeEntity = await _companyRepository.GetEmployeeAsync(companyId, employeeId);
             if (employeeEntity == null)
             {
-                return NotFound();
-            }
+                //不允许客户端生成 Guid
+                //return NotFound();
 
-            var dtoToPatch = _mapper.Map<EmployeeUpdateDto>(employeeEntity);
+                //允许客户端生成 Guid
+                var employeeDto = new EmployeeUpdateDto();
+                //传入 ModelState 进行验证
+                patchDocument.ApplyTo(employeeDto, ModelState);
+                if (!TryValidateModel(employeeDto))
+                {
+                    return ValidationProblem(ModelState);
+                }
 
-            //此处需要处理验证错误，待完成
+                var employeeToAdd = _mapper.Map<Employee>(employeeDto);
+                employeeToAdd.Id = employeeId;
+                _companyRepository.AddEmployee(companyId, employeeToAdd);
+                await _companyRepository.SaveAsync();
+                var dtoToReturn = _mapper.Map<Employee>(employeeToAdd);
 
+                return CreatedAtAction(nameof(GetEmployeeForCompany),
+                                    new { companyId = companyId, employeeId = employeeId },
+                                    dtoToReturn);
+            }
+
+            var dtoToPatch = _mapper.Map<EmployeeUpdateDto>(employeeEntity);
+            //将 Patch 应用到 dtoToPatch（EmployeeUpdateDto）
             patchDocument.ApplyTo(dtoToPatch);
+            //验证模型
+            if (!TryValidateModel(dtoToPatch))
+            {
+                return ValidationProblem(ModelState); //返回状态码与错误信息
+            }
             _mapper.Map(dtoToPatch, employeeEntity);
             _companyRepository.UpdateEmployee(employeeEntity);
             await _companyRepository.SaveAsync();
             return NoContent(); //返回状态码204
         }
 
+        /// <summary>
+        /// 重写 ValidationProblem
+        /// 使 PartiallyUpdateEmployeeForCompany 中的 ValidationProblem() 返回状态码422而不是400
+        /// </summary>
+        /// <param name="modelStateDictionary"></param>
+        /// <returns></returns>
+        public override ActionResult ValidationProblem(ModelStateDictionary modelStateDictionary)
+        {
+            var options = HttpContext.RequestServices
+                                        .GetRequiredService<IOptions<ApiBehaviorOptions>>();
+            return (ActionResult)options.Value.InvalidModelStateResponseFactory(ControllerContext);
+        }
+
         [HttpOptions]
         public IActionResult GetCompaniesOptions()
         {

Routine/Routine.APi/Data/RoutineDbContext.cs

@@ -1,9 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Routine.APi.Entities;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Routine.APi.Data
 {

Routine/Routine.APi/DtoParameters/CompanyDtoParameters.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Routine.APi.DtoParameters
+namespace Routine.APi.DtoParameters
 {
     public class CompanyDtoParameters
     {

Routine/Routine.APi/Entities/Company.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Routine.APi.Entities
 {

Routine/Routine.APi/Models/CompanyDto.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Routine.APi.Models
 {

Routine/Routine.APi/Models/EmployeeAddDto.cs

@@ -1,10 +1,4 @@
-using Routine.APi.Entities;
-using Routine.APi.ValidationAttributes;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Routine.APi.Models
+namespace Routine.APi.Models
 {
     public class EmployeeAddDto : EmployeeAddOrUpdateDto
     {

Routine/Routine.APi/Models/EmployeeUpdateDto.cs

@@ -1,12 +1,4 @@
-using Routine.APi.Entities;
-using Routine.APi.ValidationAttributes;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Routine.APi.Models
+namespace Routine.APi.Models
 {
     public class EmployeeUpdateDto : EmployeeAddOrUpdateDto
     {

Routine/Routine.APi/Program.cs

@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Routine.APi.Data;
+using System;
 
 namespace Routine.APi
 {

Routine/Routine.APi/Services/ICompanyRepository.cs

@@ -2,7 +2,6 @@
 using Routine.APi.Entities;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Routine.APi.Services