diff --git a/.vs/AdvancedWebAPI/DesignTimeBuild/.dtbcache.v2 b/.vs/AdvancedWebAPI/DesignTimeBuild/.dtbcache.v2 index efe990b..803231f 100644 Binary files a/.vs/AdvancedWebAPI/DesignTimeBuild/.dtbcache.v2 and b/.vs/AdvancedWebAPI/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/AdvancedWebAPI/FileContentIndex/045c7d0c-5690-47be-a8af-478917d50c08.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/045c7d0c-5690-47be-a8af-478917d50c08.vsidx deleted file mode 100644 index 766cd9f..0000000 Binary files a/.vs/AdvancedWebAPI/FileContentIndex/045c7d0c-5690-47be-a8af-478917d50c08.vsidx and /dev/null differ diff --git a/.vs/AdvancedWebAPI/FileContentIndex/440e4524-6238-4597-b2e2-05d8ae343ecb.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/440e4524-6238-4597-b2e2-05d8ae343ecb.vsidx deleted file mode 100644 index 8cf25c3..0000000 Binary files a/.vs/AdvancedWebAPI/FileContentIndex/440e4524-6238-4597-b2e2-05d8ae343ecb.vsidx and /dev/null differ diff --git a/.vs/AdvancedWebAPI/FileContentIndex/8d5effc6-75e5-441f-828d-472911c7d19e.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/8d5effc6-75e5-441f-828d-472911c7d19e.vsidx deleted file mode 100644 index 9d32e4d..0000000 Binary files a/.vs/AdvancedWebAPI/FileContentIndex/8d5effc6-75e5-441f-828d-472911c7d19e.vsidx and /dev/null differ diff --git a/.vs/AdvancedWebAPI/FileContentIndex/a16957e4-0e4c-4c4b-b79c-9bc4160f5cee.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/a16957e4-0e4c-4c4b-b79c-9bc4160f5cee.vsidx deleted file mode 100644 index c2d8b00..0000000 Binary files a/.vs/AdvancedWebAPI/FileContentIndex/a16957e4-0e4c-4c4b-b79c-9bc4160f5cee.vsidx and /dev/null differ diff --git a/.vs/AdvancedWebAPI/FileContentIndex/c9c680ef-b242-4a86-9aa4-ea4f6a68d565.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/c9c680ef-b242-4a86-9aa4-ea4f6a68d565.vsidx deleted file mode 100644 index 5b4c374..0000000 Binary files a/.vs/AdvancedWebAPI/FileContentIndex/c9c680ef-b242-4a86-9aa4-ea4f6a68d565.vsidx and /dev/null differ diff --git a/.vs/AdvancedWebAPI/FileContentIndex/f0ec1d39-4f7c-4f1c-b821-531dddfbb51b.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/f0ec1d39-4f7c-4f1c-b821-531dddfbb51b.vsidx deleted file mode 100644 index 1018268..0000000 Binary files a/.vs/AdvancedWebAPI/FileContentIndex/f0ec1d39-4f7c-4f1c-b821-531dddfbb51b.vsidx and /dev/null differ diff --git a/.vs/AdvancedWebAPI/v17/.futdcache.v2 b/.vs/AdvancedWebAPI/v17/.futdcache.v2 index c4eb077..71aa14a 100644 Binary files a/.vs/AdvancedWebAPI/v17/.futdcache.v2 and b/.vs/AdvancedWebAPI/v17/.futdcache.v2 differ diff --git a/.vs/AdvancedWebAPI/v17/.suo b/.vs/AdvancedWebAPI/v17/.suo index 6f5a7a8..21d8f11 100644 Binary files a/.vs/AdvancedWebAPI/v17/.suo and b/.vs/AdvancedWebAPI/v17/.suo differ diff --git a/.vs/AdvancedWebAPI/v17/HierarchyCache.v1.txt b/.vs/AdvancedWebAPI/v17/HierarchyCache.v1.txt new file mode 100644 index 0000000..1f33f94 Binary files /dev/null and b/.vs/AdvancedWebAPI/v17/HierarchyCache.v1.txt differ diff --git a/.vs/ProjectEvaluation/advancedwebapi.metadata.v5.2 b/.vs/ProjectEvaluation/advancedwebapi.metadata.v5.2 index a3fb2bb..f310d67 100644 Binary files a/.vs/ProjectEvaluation/advancedwebapi.metadata.v5.2 and b/.vs/ProjectEvaluation/advancedwebapi.metadata.v5.2 differ diff --git a/.vs/ProjectEvaluation/advancedwebapi.projects.v5.2 b/.vs/ProjectEvaluation/advancedwebapi.projects.v5.2 index c55487c..a9fa662 100644 Binary files a/.vs/ProjectEvaluation/advancedwebapi.projects.v5.2 and b/.vs/ProjectEvaluation/advancedwebapi.projects.v5.2 differ diff --git a/AWA.DataAccess/obj/Debug/net7.0/AWA.DataAccess.csproj.AssemblyReference.cache b/AWA.DataAccess/obj/Debug/net7.0/AWA.DataAccess.csproj.AssemblyReference.cache index 31301f8..aec8411 100644 Binary files a/AWA.DataAccess/obj/Debug/net7.0/AWA.DataAccess.csproj.AssemblyReference.cache and b/AWA.DataAccess/obj/Debug/net7.0/AWA.DataAccess.csproj.AssemblyReference.cache differ diff --git a/AWA.DataAccess/obj/Debug/net7.0/AWA.DataAccess.csproj.FileListAbsolute.txt b/AWA.DataAccess/obj/Debug/net7.0/AWA.DataAccess.csproj.FileListAbsolute.txt index 6bd7433..6d8c814 100644 --- a/AWA.DataAccess/obj/Debug/net7.0/AWA.DataAccess.csproj.FileListAbsolute.txt +++ b/AWA.DataAccess/obj/Debug/net7.0/AWA.DataAccess.csproj.FileListAbsolute.txt @@ -1,17 +1,17 @@ C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.DataAccess.deps.json +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.DataAccess.runtimeconfig.json C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.DataAccess.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.DataAccess.pdb +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.Models.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.Models.pdb C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.csproj.AssemblyReference.cache C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.GeneratedMSBuildEditorConfig.editorconfig C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.AssemblyInfoInputs.cache C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.AssemblyInfo.cs C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.csproj.CoreCompileInputs.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.csproj.CopyComplete C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\refint\AWA.DataAccess.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.pdb -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\ref\AWA.DataAccess.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.DataAccess.runtimeconfig.json C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.genruntimeconfig.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.Models.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\bin\Debug\net7.0\AWA.Models.pdb -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\AWA.DataAccess.csproj.CopyComplete +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.DataAccess\obj\Debug\net7.0\ref\AWA.DataAccess.dll diff --git a/AWA.Domain/Interfaces/IEmployeeRepository.cs b/AWA.Domain/Interfaces/IEmployeeRepository.cs new file mode 100644 index 0000000..8f6040e --- /dev/null +++ b/AWA.Domain/Interfaces/IEmployeeRepository.cs @@ -0,0 +1,8 @@ +using AWA.Models; + +namespace AWA.Domain.Interfaces +{ + public interface IEmployeeRepository: IGenericRepository + { + } +} diff --git a/AWA.Domain/Interfaces/IUnitOfWork.cs b/AWA.Domain/Interfaces/IUnitOfWork.cs index 97978a8..bd06960 100644 --- a/AWA.Domain/Interfaces/IUnitOfWork.cs +++ b/AWA.Domain/Interfaces/IUnitOfWork.cs @@ -6,6 +6,7 @@ public interface IUnitOfWork : IDisposable IContactTypeRepository ContactTypes { get; } IPersonRepository People { get; } IEmailAddressRepository EmailAddresses { get; } + IEmployeeRepository Employees { get; } int Complete(); } } diff --git a/AWA.Domain/bin/Debug/net7.0/AWA.Domain.dll b/AWA.Domain/bin/Debug/net7.0/AWA.Domain.dll index 84d3a75..5773020 100644 Binary files a/AWA.Domain/bin/Debug/net7.0/AWA.Domain.dll and b/AWA.Domain/bin/Debug/net7.0/AWA.Domain.dll differ diff --git a/AWA.Domain/bin/Debug/net7.0/AWA.Domain.pdb b/AWA.Domain/bin/Debug/net7.0/AWA.Domain.pdb index dd10dfb..b53f65a 100644 Binary files a/AWA.Domain/bin/Debug/net7.0/AWA.Domain.pdb and b/AWA.Domain/bin/Debug/net7.0/AWA.Domain.pdb differ diff --git a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.AssemblyReference.cache b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.AssemblyReference.cache index 13efd61..021b979 100644 Binary files a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.AssemblyReference.cache and b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.AssemblyReference.cache differ diff --git a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.CoreCompileInputs.cache b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.CoreCompileInputs.cache index 3bc9bf8..4bcffad 100644 --- a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.CoreCompileInputs.cache +++ b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e9cbf5c2cab007d8dc4252b55e7181d90cce5fa3 +fa3426309847ac656020e7966d6f021289e7e23a diff --git a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.FileListAbsolute.txt b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.FileListAbsolute.txt index 66be617..b9362fa 100644 --- a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.FileListAbsolute.txt +++ b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.csproj.FileListAbsolute.txt @@ -1,13 +1,13 @@ -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.csproj.AssemblyReference.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.GeneratedMSBuildEditorConfig.editorconfig -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.AssemblyInfoInputs.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.AssemblyInfo.cs -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.csproj.CoreCompileInputs.cache C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\bin\Debug\net7.0\AWA.Domain.deps.json C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\bin\Debug\net7.0\AWA.Domain.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\bin\Debug\net7.0\AWA.Domain.pdb C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\bin\Debug\net7.0\AWA.Models.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\bin\Debug\net7.0\AWA.Models.pdb +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.csproj.AssemblyReference.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.GeneratedMSBuildEditorConfig.editorconfig +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.AssemblyInfoInputs.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.AssemblyInfo.cs +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.csproj.CoreCompileInputs.cache C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.csproj.CopyComplete C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\AWA.Domain.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Domain\obj\Debug\net7.0\refint\AWA.Domain.dll diff --git a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.dll b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.dll index 84d3a75..5773020 100644 Binary files a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.dll and b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.dll differ diff --git a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.pdb b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.pdb index dd10dfb..b53f65a 100644 Binary files a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.pdb and b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.pdb differ diff --git a/AWA.Domain/obj/Debug/net7.0/ref/AWA.Domain.dll b/AWA.Domain/obj/Debug/net7.0/ref/AWA.Domain.dll index 6df118a..295f9e2 100644 Binary files a/AWA.Domain/obj/Debug/net7.0/ref/AWA.Domain.dll and b/AWA.Domain/obj/Debug/net7.0/ref/AWA.Domain.dll differ diff --git a/AWA.Domain/obj/Debug/net7.0/refint/AWA.Domain.dll b/AWA.Domain/obj/Debug/net7.0/refint/AWA.Domain.dll index 6df118a..295f9e2 100644 Binary files a/AWA.Domain/obj/Debug/net7.0/refint/AWA.Domain.dll and b/AWA.Domain/obj/Debug/net7.0/refint/AWA.Domain.dll differ diff --git a/AWA.MinApi/Program.cs b/AWA.MinApi/Program.cs index e56c8ad..e3d8af1 100644 --- a/AWA.MinApi/Program.cs +++ b/AWA.MinApi/Program.cs @@ -1,8 +1,6 @@ using AWA.Repository; using AWA.Services; using AWA.Services.Interfaces; -using Azure; -using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; @@ -12,7 +10,7 @@ // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); -var connectionString = builder.Configuration.GetConnectionString("AdventureWorksConnection")?? ""; +var connectionString = builder.Configuration.GetConnectionString("AdventureWorksConnection") ?? ""; builder.Services.AddDIServices(connectionString); builder.Services.AddScoped(); var app = builder.Build(); @@ -28,11 +26,15 @@ app.MapGet("/getAllPeople", async (IPersonService personService) => { - return await personService.GetAllPeople(); + return await personService.GetAllPeople(); }); -app.MapGet("/getPagedPeople", (HttpContext http, IPersonService personService, [AsParameters] PersonParameters personParameters) => +app.MapGet("/getPagedPeople", (HttpContext http, IPersonService personService, [AsParameters] PersonParameters personParameters) => { - var pagedPeople= personService.GetPagedPeople(personParameters); + if (!personParameters.ValidYearRange) + { + return Results.BadRequest("Max year of birth cannot be less than min year of birth"); + } + var pagedPeople = personService.GetPagedPeople(personParameters); var metadata = new { pagedPeople.TotalCount, @@ -43,7 +45,7 @@ pagedPeople.HasPrevious }; http.Response.Headers.Add("X-Pagination", JsonConvert.SerializeObject(metadata)); - return pagedPeople; + return Results.Ok(pagedPeople); }); diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.dll b/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.dll index 84d3a75..5773020 100644 Binary files a/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.dll and b/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.dll differ diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.pdb b/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.pdb index dd10dfb..b53f65a 100644 Binary files a/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.pdb and b/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.pdb differ diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.dll b/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.dll index f7b093e..c76d99a 100644 Binary files a/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.dll and b/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.dll differ diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.pdb b/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.pdb index 8172fc1..fabbb19 100644 Binary files a/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.pdb and b/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.pdb differ diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.dll b/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.dll index 3c921a6..6580345 100644 Binary files a/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.dll and b/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.dll differ diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.pdb b/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.pdb index ac85563..aa7c9c6 100644 Binary files a/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.pdb and b/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.pdb differ diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Services.dll b/AWA.MinApi/bin/Debug/net7.0/AWA.Services.dll index e5aaceb..d11e673 100644 Binary files a/AWA.MinApi/bin/Debug/net7.0/AWA.Services.dll and b/AWA.MinApi/bin/Debug/net7.0/AWA.Services.dll differ diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Services.pdb b/AWA.MinApi/bin/Debug/net7.0/AWA.Services.pdb index a8015c9..dd6e7d1 100644 Binary files a/AWA.MinApi/bin/Debug/net7.0/AWA.Services.pdb and b/AWA.MinApi/bin/Debug/net7.0/AWA.Services.pdb differ diff --git a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.csproj.AssemblyReference.cache b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.csproj.AssemblyReference.cache index 63fa6f2..acb875d 100644 Binary files a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.csproj.AssemblyReference.cache and b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.csproj.AssemblyReference.cache differ diff --git a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.csproj.FileListAbsolute.txt b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.csproj.FileListAbsolute.txt index a9bc74f..ada54d8 100644 --- a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.csproj.FileListAbsolute.txt +++ b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.csproj.FileListAbsolute.txt @@ -5,34 +5,9 @@ C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\AWA.MinA C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\AWA.MinApi.runtimeconfig.json C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\AWA.MinApi.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\AWA.MinApi.pdb -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.AspNetCore.OpenApi.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.OpenApi.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Swashbuckle.AspNetCore.Swagger.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Swashbuckle.AspNetCore.SwaggerGen.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Swashbuckle.AspNetCore.SwaggerUI.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.csproj.AssemblyReference.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.GeneratedMSBuildEditorConfig.editorconfig -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.AssemblyInfoInputs.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.AssemblyInfo.cs -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.csproj.CoreCompileInputs.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.MvcApplicationPartsAssemblyInfo.cs -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.MvcApplicationPartsAssemblyInfo.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets\msbuild.AWA.MinApi.Microsoft.AspNetCore.StaticWebAssets.props -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets\msbuild.build.AWA.MinApi.props -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets\msbuild.buildMultiTargeting.AWA.MinApi.props -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets\msbuild.buildTransitive.AWA.MinApi.props -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets.pack.json -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets.build.json -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets.development.json -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\scopedcss\bundle\AWA.MinApi.styles.css -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.csproj.CopyComplete -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\refint\AWA.MinApi.dll -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.pdb -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.genruntimeconfig.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\ref\AWA.MinApi.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Azure.Core.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Azure.Identity.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.AspNetCore.OpenApi.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.Bcl.AsyncInterfaces.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.Data.SqlClient.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.EntityFrameworkCore.dll @@ -47,8 +22,13 @@ C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsof C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.IdentityModel.Protocols.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.IdentityModel.Tokens.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.OpenApi.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.SqlServer.Server.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Microsoft.Win32.SystemEvents.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Newtonsoft.Json.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Swashbuckle.AspNetCore.Swagger.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Swashbuckle.AspNetCore.SwaggerGen.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Swashbuckle.AspNetCore.SwaggerUI.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\System.Configuration.ConfigurationManager.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\System.Drawing.Common.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\System.IdentityModel.Tokens.Jwt.dll @@ -79,4 +59,24 @@ C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\AWA.Serv C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\AWA.DataAccess.pdb C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\AWA.Domain.pdb C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\AWA.Models.pdb -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\bin\Debug\net7.0\Newtonsoft.Json.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.csproj.AssemblyReference.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.GeneratedMSBuildEditorConfig.editorconfig +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.AssemblyInfoInputs.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.AssemblyInfo.cs +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.csproj.CoreCompileInputs.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.MvcApplicationPartsAssemblyInfo.cs +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.MvcApplicationPartsAssemblyInfo.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets\msbuild.AWA.MinApi.Microsoft.AspNetCore.StaticWebAssets.props +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets\msbuild.build.AWA.MinApi.props +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets\msbuild.buildMultiTargeting.AWA.MinApi.props +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets\msbuild.buildTransitive.AWA.MinApi.props +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets.pack.json +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets.build.json +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\staticwebassets.development.json +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\scopedcss\bundle\AWA.MinApi.styles.css +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.csproj.CopyComplete +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\refint\AWA.MinApi.dll +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.pdb +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\AWA.MinApi.genruntimeconfig.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.MinApi\obj\Debug\net7.0\ref\AWA.MinApi.dll diff --git a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.dll b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.dll index f7b093e..c76d99a 100644 Binary files a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.dll and b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.dll differ diff --git a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.pdb b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.pdb index 8172fc1..fabbb19 100644 Binary files a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.pdb and b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.pdb differ diff --git a/AWA.MinApi/obj/Debug/net7.0/ref/AWA.MinApi.dll b/AWA.MinApi/obj/Debug/net7.0/ref/AWA.MinApi.dll index 3a78554..bb1a935 100644 Binary files a/AWA.MinApi/obj/Debug/net7.0/ref/AWA.MinApi.dll and b/AWA.MinApi/obj/Debug/net7.0/ref/AWA.MinApi.dll differ diff --git a/AWA.MinApi/obj/Debug/net7.0/refint/AWA.MinApi.dll b/AWA.MinApi/obj/Debug/net7.0/refint/AWA.MinApi.dll index 3a78554..bb1a935 100644 Binary files a/AWA.MinApi/obj/Debug/net7.0/refint/AWA.MinApi.dll and b/AWA.MinApi/obj/Debug/net7.0/refint/AWA.MinApi.dll differ diff --git a/AWA.Repository/EmployeeRepository.cs b/AWA.Repository/EmployeeRepository.cs new file mode 100644 index 0000000..9267aca --- /dev/null +++ b/AWA.Repository/EmployeeRepository.cs @@ -0,0 +1,14 @@ +using AWA.DataAccess; +using AWA.Domain.Interfaces; +using AWA.Models; + +namespace AWA.Repository +{ + internal class EmployeeRepository : GenericRepository, IEmployeeRepository + { + public EmployeeRepository(AdventureWorksContext context) : base(context) + { + } + } + +} diff --git a/AWA.Repository/UnitOfWork.cs b/AWA.Repository/UnitOfWork.cs index 0f169b9..cc4d406 100644 --- a/AWA.Repository/UnitOfWork.cs +++ b/AWA.Repository/UnitOfWork.cs @@ -15,18 +15,22 @@ public class UnitOfWork : IUnitOfWork public IPersonRepository People { get; } public IEmailAddressRepository EmailAddresses { get; } + + public IEmployeeRepository Employees { get; } + public UnitOfWork(AdventureWorksContext dbContext, IBusinessEntityContactRepository businessEntityContactRepository, IContactTypeRepository contactTypeRepository, IPersonRepository personRepository, - IEmailAddressRepository emailAddressRepository) + IEmailAddressRepository emailAddressRepository, + IEmployeeRepository employee) { this._dbContext = dbContext; this.BusinessEntityContacts = businessEntityContactRepository; this.ContactTypes = contactTypeRepository; this.People = personRepository; this.EmailAddresses = emailAddressRepository; - + this.Employees = employee; } public int Complete() diff --git a/AWA.Repository/bin/Debug/net7.0/AWA.Domain.dll b/AWA.Repository/bin/Debug/net7.0/AWA.Domain.dll index 84d3a75..5773020 100644 Binary files a/AWA.Repository/bin/Debug/net7.0/AWA.Domain.dll and b/AWA.Repository/bin/Debug/net7.0/AWA.Domain.dll differ diff --git a/AWA.Repository/bin/Debug/net7.0/AWA.Domain.pdb b/AWA.Repository/bin/Debug/net7.0/AWA.Domain.pdb index dd10dfb..b53f65a 100644 Binary files a/AWA.Repository/bin/Debug/net7.0/AWA.Domain.pdb and b/AWA.Repository/bin/Debug/net7.0/AWA.Domain.pdb differ diff --git a/AWA.Repository/bin/Debug/net7.0/AWA.Repository.dll b/AWA.Repository/bin/Debug/net7.0/AWA.Repository.dll index 3c921a6..6580345 100644 Binary files a/AWA.Repository/bin/Debug/net7.0/AWA.Repository.dll and b/AWA.Repository/bin/Debug/net7.0/AWA.Repository.dll differ diff --git a/AWA.Repository/bin/Debug/net7.0/AWA.Repository.pdb b/AWA.Repository/bin/Debug/net7.0/AWA.Repository.pdb index ac85563..aa7c9c6 100644 Binary files a/AWA.Repository/bin/Debug/net7.0/AWA.Repository.pdb and b/AWA.Repository/bin/Debug/net7.0/AWA.Repository.pdb differ diff --git a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.AssemblyReference.cache b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.AssemblyReference.cache index ee1814f..6a119be 100644 Binary files a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.AssemblyReference.cache and b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.AssemblyReference.cache differ diff --git a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.CoreCompileInputs.cache b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.CoreCompileInputs.cache index 9050b77..20d23ed 100644 --- a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.CoreCompileInputs.cache +++ b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -9d8781ef389cfe39f85737018282911b52e8a2b3 +0982d8982f0bfc2b35b5636025dcbbd0e8a2b241 diff --git a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.FileListAbsolute.txt b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.FileListAbsolute.txt index 367b830..5c063a6 100644 --- a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.FileListAbsolute.txt +++ b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.csproj.FileListAbsolute.txt @@ -1,8 +1,3 @@ -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.csproj.AssemblyReference.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.GeneratedMSBuildEditorConfig.editorconfig -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.AssemblyInfoInputs.cache -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.AssemblyInfo.cs -C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.csproj.CoreCompileInputs.cache C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\bin\Debug\net7.0\AWA.Repository.deps.json C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\bin\Debug\net7.0\AWA.Repository.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\bin\Debug\net7.0\AWA.Repository.pdb @@ -12,6 +7,11 @@ C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\bin\Debug\net7.0\AWA. C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\bin\Debug\net7.0\AWA.DataAccess.pdb C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\bin\Debug\net7.0\AWA.Domain.pdb C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\bin\Debug\net7.0\AWA.Models.pdb +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.csproj.AssemblyReference.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.GeneratedMSBuildEditorConfig.editorconfig +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.AssemblyInfoInputs.cache +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.AssemblyInfo.cs +C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.csproj.CoreCompileInputs.cache C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.csproj.CopyComplete C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\AWA.Repository.dll C:\Elio\Development\Projects\AdvancedWebAPI\AWA.Repository\obj\Debug\net7.0\refint\AWA.Repository.dll diff --git a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.dll b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.dll index 3c921a6..6580345 100644 Binary files a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.dll and b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.dll differ diff --git a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.pdb b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.pdb index ac85563..aa7c9c6 100644 Binary files a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.pdb and b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.pdb differ diff --git a/AWA.Repository/obj/Debug/net7.0/ref/AWA.Repository.dll b/AWA.Repository/obj/Debug/net7.0/ref/AWA.Repository.dll index d952664..83d6f0f 100644 Binary files a/AWA.Repository/obj/Debug/net7.0/ref/AWA.Repository.dll and b/AWA.Repository/obj/Debug/net7.0/ref/AWA.Repository.dll differ diff --git a/AWA.Repository/obj/Debug/net7.0/refint/AWA.Repository.dll b/AWA.Repository/obj/Debug/net7.0/refint/AWA.Repository.dll index d952664..83d6f0f 100644 Binary files a/AWA.Repository/obj/Debug/net7.0/refint/AWA.Repository.dll and b/AWA.Repository/obj/Debug/net7.0/refint/AWA.Repository.dll differ diff --git a/AWA.Services/DTOPeople.cs b/AWA.Services/DTOPeople.cs index d32c014..fe6bc49 100644 --- a/AWA.Services/DTOPeople.cs +++ b/AWA.Services/DTOPeople.cs @@ -3,10 +3,12 @@ public class DTOPeople { public int BusinessEntityId { get; internal set; } - public string Name { get; internal set; } + public string? Name { get; internal set; } public string? Title { get; internal set; } - public string FirstName { get; internal set; } - public string LastName { get; internal set; } + public string? FirstName { get; internal set; } + public string? LastName { get; internal set; } public string? EmailAddress { get; internal set; } + public DateTime BirthDate { get; internal set; } + public string? JobTitle { get; internal set; } } } \ No newline at end of file diff --git a/AWA.Services/PersonParameters.cs b/AWA.Services/PersonParameters.cs index d2659c9..38f020a 100644 --- a/AWA.Services/PersonParameters.cs +++ b/AWA.Services/PersonParameters.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AWA.Services +namespace AWA.Services { public class PersonParameters:QueryStringParameters { + public uint MinYearOfBirth { get; set; } + public uint MaxYearOfBirth { get; set; } = (uint)DateTime.Now.Year; + public bool ValidYearRange => MaxYearOfBirth > MinYearOfBirth; } } diff --git a/AWA.Services/PersonService.cs b/AWA.Services/PersonService.cs index 0e8b412..6d8e6bb 100644 --- a/AWA.Services/PersonService.cs +++ b/AWA.Services/PersonService.cs @@ -18,28 +18,23 @@ public async Task> GetAllPeople() var contactType = await _unitOfWork.ContactTypes.GetAll(); var people = await _unitOfWork.People.GetAll(); var emailAddress = await _unitOfWork.EmailAddresses.GetAll(); + var employees =await _unitOfWork.Employees.GetAll(); var result = (from b in businessEntityContact join c in contactType on b.ContactTypeId equals c.ContactTypeId join p in people on b.PersonId equals p.BusinessEntityId join e in emailAddress on p.BusinessEntityId equals e.BusinessEntityId - select new DTOPeople { BusinessEntityId = b.BusinessEntityId, Name = c.Name, Title = p.Title, FirstName = p.FirstName, LastName = p.LastName, EmailAddress = e.EmailAddress1 } + join em in employees on p.BusinessEntityId equals em.BusinessEntityId + select new DTOPeople { BusinessEntityId = b.BusinessEntityId, Name = c.Name, Title = p.Title, FirstName = p.FirstName, LastName = p.LastName, EmailAddress = e.EmailAddress1,BirthDate=em.BirthDate,JobTitle=em.JobTitle } ); return result; } - //public PagedList GetPagedPeople(PersonParameters personParameters) - //{ - // var allPeople = GetAllPeople().Result.ToList(); - // int totalRecords = allPeople.Count(); - // //var items = allPeople.Skip((personParameters.PageNumber - 1) * personParameters.PageSize).Take(personParameters.PageSize).ToList(); - // var result = new PagedList(allPeople, totalRecords, personParameters.PageNumber, personParameters.PageSize); - // return result.top; - - //} public PagedList GetPagedPeople(PersonParameters personParameters) { - var allPeople = GetAllPeople().Result.AsQueryable(); - return PagedList.ToPagedList(allPeople, personParameters.PageNumber, personParameters.PageSize); + var allPeople = GetAllPeople().Result.AsQueryable() + .Where(o => o.BirthDate.Year >= personParameters.MinYearOfBirth && o.BirthDate.Year <= personParameters.MaxYearOfBirth) + .OrderBy(so => so.Name); + return PagedList.ToPagedList(allPeople, personParameters.PageNumber, personParameters.PageSize); } } } diff --git a/AWA.Services/bin/Debug/net7.0/AWA.Domain.dll b/AWA.Services/bin/Debug/net7.0/AWA.Domain.dll index 84d3a75..5773020 100644 Binary files a/AWA.Services/bin/Debug/net7.0/AWA.Domain.dll and b/AWA.Services/bin/Debug/net7.0/AWA.Domain.dll differ diff --git a/AWA.Services/bin/Debug/net7.0/AWA.Domain.pdb b/AWA.Services/bin/Debug/net7.0/AWA.Domain.pdb index dd10dfb..b53f65a 100644 Binary files a/AWA.Services/bin/Debug/net7.0/AWA.Domain.pdb and b/AWA.Services/bin/Debug/net7.0/AWA.Domain.pdb differ diff --git a/AWA.Services/bin/Debug/net7.0/AWA.Services.dll b/AWA.Services/bin/Debug/net7.0/AWA.Services.dll index e5aaceb..d11e673 100644 Binary files a/AWA.Services/bin/Debug/net7.0/AWA.Services.dll and b/AWA.Services/bin/Debug/net7.0/AWA.Services.dll differ diff --git a/AWA.Services/bin/Debug/net7.0/AWA.Services.pdb b/AWA.Services/bin/Debug/net7.0/AWA.Services.pdb index a8015c9..dd6e7d1 100644 Binary files a/AWA.Services/bin/Debug/net7.0/AWA.Services.pdb and b/AWA.Services/bin/Debug/net7.0/AWA.Services.pdb differ diff --git a/AWA.Services/obj/Debug/net7.0/AWA.Services.csproj.AssemblyReference.cache b/AWA.Services/obj/Debug/net7.0/AWA.Services.csproj.AssemblyReference.cache index 7d75f10..f1e05a8 100644 Binary files a/AWA.Services/obj/Debug/net7.0/AWA.Services.csproj.AssemblyReference.cache and b/AWA.Services/obj/Debug/net7.0/AWA.Services.csproj.AssemblyReference.cache differ diff --git a/AWA.Services/obj/Debug/net7.0/AWA.Services.dll b/AWA.Services/obj/Debug/net7.0/AWA.Services.dll index e5aaceb..d11e673 100644 Binary files a/AWA.Services/obj/Debug/net7.0/AWA.Services.dll and b/AWA.Services/obj/Debug/net7.0/AWA.Services.dll differ diff --git a/AWA.Services/obj/Debug/net7.0/AWA.Services.pdb b/AWA.Services/obj/Debug/net7.0/AWA.Services.pdb index a8015c9..dd6e7d1 100644 Binary files a/AWA.Services/obj/Debug/net7.0/AWA.Services.pdb and b/AWA.Services/obj/Debug/net7.0/AWA.Services.pdb differ diff --git a/AWA.Services/obj/Debug/net7.0/ref/AWA.Services.dll b/AWA.Services/obj/Debug/net7.0/ref/AWA.Services.dll index 84ca46b..64a23c9 100644 Binary files a/AWA.Services/obj/Debug/net7.0/ref/AWA.Services.dll and b/AWA.Services/obj/Debug/net7.0/ref/AWA.Services.dll differ diff --git a/AWA.Services/obj/Debug/net7.0/refint/AWA.Services.dll b/AWA.Services/obj/Debug/net7.0/refint/AWA.Services.dll index 84ca46b..64a23c9 100644 Binary files a/AWA.Services/obj/Debug/net7.0/refint/AWA.Services.dll and b/AWA.Services/obj/Debug/net7.0/refint/AWA.Services.dll differ diff --git a/README.md b/README.md index 8e01bbb..fea43bf 100644 --- a/README.md +++ b/README.md @@ -299,4 +299,9 @@ dotnet tool update --global dotnet-ef BusinessEntityContactRepository ContactTypeRepository PersonRepository -EmailAddressRepository \ No newline at end of file +EmailAddressRepository + +https://code-maze.com/paging-aspnet-core-webapi/ +https://code-maze.com/filtering-aspnet-core-webapi/ +https://code-maze.com/searching-aspnet-core-webapi/ +https://code-maze.com/sorting-aspnet-core-webapi/