NeckerFree · NeckerFree · Jan 8, 2023 · Jan 8, 2023
diff --git a/.vs/AdvancedWebAPI/DesignTimeBuild/.dtbcache.v2 b/.vs/AdvancedWebAPI/DesignTimeBuild/.dtbcache.v2
diff --git a/.vs/AdvancedWebAPI/FileContentIndex/2b985893-2f60-4458-8067-499a161ada96.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/2b985893-2f60-4458-8067-499a161ada96.vsidx
diff --git a/.vs/AdvancedWebAPI/FileContentIndex/5404cf11-e4c2-4b35-af1b-f86364feb99b.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/5404cf11-e4c2-4b35-af1b-f86364feb99b.vsidx
diff --git a/.vs/AdvancedWebAPI/FileContentIndex/946cdce2-d522-4ca8-a57e-60e94c47a27b.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/946cdce2-d522-4ca8-a57e-60e94c47a27b.vsidx
diff --git a/.vs/AdvancedWebAPI/FileContentIndex/aa18d6b3-359b-4fb2-8c7d-b7071b79708f.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/aa18d6b3-359b-4fb2-8c7d-b7071b79708f.vsidx
diff --git a/.vs/AdvancedWebAPI/FileContentIndex/b2ba502a-09a5-4a64-941c-5efc6b73c2e8.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/b2ba502a-09a5-4a64-941c-5efc6b73c2e8.vsidx
diff --git a/.vs/AdvancedWebAPI/FileContentIndex/b9da0737-8d53-4d0b-a278-745cdf04239b.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/b9da0737-8d53-4d0b-a278-745cdf04239b.vsidx
diff --git a/.vs/AdvancedWebAPI/FileContentIndex/d2f16d84-93cc-483d-8b6e-5ffb3f476c65.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/d2f16d84-93cc-483d-8b6e-5ffb3f476c65.vsidx
diff --git a/.vs/AdvancedWebAPI/FileContentIndex/fba4d009-fdb6-4df8-b20a-ffdc2030270b.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/fba4d009-fdb6-4df8-b20a-ffdc2030270b.vsidx
diff --git a/.vs/AdvancedWebAPI/v17/.futdcache.v2 b/.vs/AdvancedWebAPI/v17/.futdcache.v2
diff --git a/.vs/AdvancedWebAPI/v17/.suo b/.vs/AdvancedWebAPI/v17/.suo
diff --git a/.vs/ProjectEvaluation/advancedwebapi.metadata.v5.2 b/.vs/ProjectEvaluation/advancedwebapi.metadata.v5.2
diff --git a/.vs/ProjectEvaluation/advancedwebapi.projects.v5.2 b/.vs/ProjectEvaluation/advancedwebapi.projects.v5.2
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
diff --git a/AWA.Domain/Interfaces/IBusinessEntityContactRepository.cs b/AWA.Domain/Interfaces/IBusinessEntityContactRepository.cs
diff --git a/AWA.Domain/Interfaces/IContactTypeRepository.cs b/AWA.Domain/Interfaces/IContactTypeRepository.cs
diff --git a/AWA.Domain/bin/Debug/net7.0/AWA.Domain.dll b/AWA.Domain/bin/Debug/net7.0/AWA.Domain.dll
diff --git a/AWA.Domain/bin/Debug/net7.0/AWA.Domain.pdb b/AWA.Domain/bin/Debug/net7.0/AWA.Domain.pdb
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
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
@@ -1 +1 @@
-fa3426309847ac656020e7966d6f021289e7e23a
+7753c791ba0f150fa627e8f6142fd033d9f31034
diff --git a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.dll b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.dll
diff --git a/AWA.Domain/obj/Debug/net7.0/AWA.Domain.pdb b/AWA.Domain/obj/Debug/net7.0/AWA.Domain.pdb
diff --git a/AWA.Domain/obj/Debug/net7.0/ref/AWA.Domain.dll b/AWA.Domain/obj/Debug/net7.0/ref/AWA.Domain.dll
diff --git a/AWA.Domain/obj/Debug/net7.0/refint/AWA.Domain.dll b/AWA.Domain/obj/Debug/net7.0/refint/AWA.Domain.dll
diff --git a/AWA.MinApi/Program.cs b/AWA.MinApi/Program.cs
@@ -28,7 +28,7 @@
 {
     return await personService.GetAllPeople();
 });
-app.MapGet("/getPagedPeople", (HttpContext http, IPersonService personService, [AsParameters] PersonParameters personParameters) =>
+app.MapGet("/getAdvancedPeople", (HttpContext http, IPersonService personService, [AsParameters] PersonParameters personParameters) =>
 {
     if (!personParameters.ValidYearRange)
     {

diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.dll b/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.dll
diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.pdb b/AWA.MinApi/bin/Debug/net7.0/AWA.Domain.pdb
diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.dll b/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.dll
diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.pdb b/AWA.MinApi/bin/Debug/net7.0/AWA.MinApi.pdb
diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.dll b/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.dll
diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.pdb b/AWA.MinApi/bin/Debug/net7.0/AWA.Repository.pdb
diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Services.dll b/AWA.MinApi/bin/Debug/net7.0/AWA.Services.dll
diff --git a/AWA.MinApi/bin/Debug/net7.0/AWA.Services.pdb b/AWA.MinApi/bin/Debug/net7.0/AWA.Services.pdb
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
diff --git a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.dll b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.dll
diff --git a/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.pdb b/AWA.MinApi/obj/Debug/net7.0/AWA.MinApi.pdb
diff --git a/AWA.Repository/BusinessEntityContactRepository.cs b/AWA.Repository/BusinessEntityContactRepository.cs
diff --git a/AWA.Repository/ContactTypeRepository.cs b/AWA.Repository/ContactTypeRepository.cs
diff --git a/AWA.Repository/UnitOfWork.cs b/AWA.Repository/UnitOfWork.cs
@@ -8,26 +8,18 @@ public class UnitOfWork : IUnitOfWork
 
         private readonly AdventureWorksContext _dbContext;
 
-        //public IBusinessEntityContactRepository BusinessEntityContacts { get; }
-
-        //public IContactTypeRepository ContactTypes { get; }
-
         public IPersonRepository People { get; }
 
         public IEmailAddressRepository EmailAddresses { get; }
 
         public IEmployeeRepository Employees { get; }
 
         public UnitOfWork(AdventureWorksContext dbContext,
-                            //IBusinessEntityContactRepository businessEntityContactRepository,
-                            //IContactTypeRepository contactTypeRepository,
                             IPersonRepository personRepository,
                             IEmailAddressRepository emailAddressRepository,
                             IEmployeeRepository employeeRepository)
         {
             this._dbContext = dbContext;
-            //this.BusinessEntityContacts = businessEntityContactRepository;
-            //this.ContactTypes = contactTypeRepository;
             this.People = personRepository;
             this.EmailAddresses = emailAddressRepository;
             this.Employees = employeeRepository;

diff --git a/AWA.Repository/bin/Debug/net7.0/AWA.Domain.dll b/AWA.Repository/bin/Debug/net7.0/AWA.Domain.dll
diff --git a/AWA.Repository/bin/Debug/net7.0/AWA.Domain.pdb b/AWA.Repository/bin/Debug/net7.0/AWA.Domain.pdb
diff --git a/AWA.Repository/bin/Debug/net7.0/AWA.Repository.dll b/AWA.Repository/bin/Debug/net7.0/AWA.Repository.dll
diff --git a/AWA.Repository/bin/Debug/net7.0/AWA.Repository.pdb b/AWA.Repository/bin/Debug/net7.0/AWA.Repository.pdb
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
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
@@ -1 +1 @@
-0982d8982f0bfc2b35b5636025dcbbd0e8a2b241
+48a692c13b0359df347c3008e018440cbb6b43e8
diff --git a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.dll b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.dll
diff --git a/AWA.Repository/obj/Debug/net7.0/AWA.Repository.pdb b/AWA.Repository/obj/Debug/net7.0/AWA.Repository.pdb
diff --git a/AWA.Repository/obj/Debug/net7.0/ref/AWA.Repository.dll b/AWA.Repository/obj/Debug/net7.0/ref/AWA.Repository.dll
diff --git a/AWA.Repository/obj/Debug/net7.0/refint/AWA.Repository.dll b/AWA.Repository/obj/Debug/net7.0/refint/AWA.Repository.dll
diff --git a/AWA.Services/DTOPeople.cs b/AWA.Services/DTOPeople.cs
@@ -9,5 +9,6 @@ public class DTOPeople
         public string? EmailAddress { get; internal set; }
         public DateTime BirthDate { get; internal set; }
         public string? JobTitle { get; internal set; }
+        public string? FullName { get; internal set; } = null;
     }
 }
diff --git a/AWA.Services/PersonParameters.cs b/AWA.Services/PersonParameters.cs
@@ -1,9 +1,11 @@
 namespace AWA.Services
 {
-    public class PersonParameters:QueryStringParameters
+    public class PersonParameters : QueryStringParameters
     {
-        public uint MinYearOfBirth { get; set; }
-        public uint MaxYearOfBirth { get; set; } = (uint)DateTime.Now.Year;
-        public bool ValidYearRange => MaxYearOfBirth > MinYearOfBirth;
+        public uint? MinYearOfBirth { get; set; }
+        public uint? MaxYearOfBirth { get; set; } = (uint)DateTime.Now.Year;
+        public bool ValidYearRange => (MaxYearOfBirth == null & MinYearOfBirth == null) || (MaxYearOfBirth > MinYearOfBirth);
+        public string? Name { get; internal set; } = "";
+        public string? JobTitle { get; internal set; } = "";
     }
 }
diff --git a/AWA.Services/PersonService.cs b/AWA.Services/PersonService.cs
@@ -14,8 +14,6 @@ public PersonService(IUnitOfWork unitOfWork)
         }
         public async Task<IEnumerable<DTOPeople>> GetAllPeople()
         {
-            //var businessEntityContact = await _unitOfWork.BusinessEntityContacts.GetAll();
-            //var contactType = await _unitOfWork.ContactTypes.GetAll();
             var people = await _unitOfWork.People.GetAll();
             var emailAddress = await _unitOfWork.EmailAddresses.GetAll();
             var employees = await _unitOfWork.Employees.GetAll();
@@ -30,7 +28,8 @@ join e in emailAddress on p.BusinessEntityId equals e.BusinessEntityId
                               LastName = p.LastName,
                               EmailAddress = e.EmailAddress1,
                               BirthDate = em.BirthDate,
-                              JobTitle = em.JobTitle
+                              JobTitle = em.JobTitle,
+                              FullName = $"{p.FirstName} {p.LastName}"
                           }
                           );
             return result;
@@ -40,10 +39,27 @@ join e in emailAddress on p.BusinessEntityId equals e.BusinessEntityId
 
         public PagedList<DTOPeople> GetPagedPeople(PersonParameters personParameters)
         {
-            var allPeople = GetAllPeople().Result.AsQueryable<DTOPeople>()
-                 .Where(o => o.BirthDate.Year >= personParameters.MinYearOfBirth && o.BirthDate.Year <= personParameters.MaxYearOfBirth)
-                 .OrderBy(so => so.FirstName);
+            var allPeople = GetAllPeople().Result.AsQueryable<DTOPeople>().OrderBy(so => so.FullName);
+            if (personParameters.MinYearOfBirth != null && personParameters.MaxYearOfBirth != null)
+            {
+                allPeople = (IOrderedQueryable<DTOPeople>)allPeople
+                    .Where(o => o.BirthDate.Year >= personParameters.MinYearOfBirth && o.BirthDate.Year <= personParameters.MaxYearOfBirth);
+            }
+            SearchPeople(ref allPeople, personParameters.Name, personParameters.JobTitle);
             return PagedList<DTOPeople>.ToPagedList(allPeople, personParameters.PageNumber, personParameters.PageSize);
         }
+
+        private void SearchPeople(ref IOrderedQueryable<DTOPeople> allPeople, string? name, string? jobTitle)
+        {
+            if (allPeople.Any() == false) return;
+            if (string.IsNullOrWhiteSpace(name) && string.IsNullOrWhiteSpace(jobTitle)) return;
+            allPeople = ((IOrderedQueryable<DTOPeople>)(
+                from ap in allPeople
+                where (
+                (string.IsNullOrWhiteSpace(ap.FullName) || string.IsNullOrWhiteSpace(name) || ap.FullName.ToLower().Contains(name.Trim().ToLower())) &&
+                (string.IsNullOrWhiteSpace(ap.JobTitle) || string.IsNullOrWhiteSpace(jobTitle) || ap.JobTitle.ToLower().Contains(jobTitle.Trim().ToLower())))
+                select ap));
+
+        }
     }
 }
diff --git a/AWA.Services/bin/Debug/net7.0/AWA.Domain.dll b/AWA.Services/bin/Debug/net7.0/AWA.Domain.dll
diff --git a/AWA.Services/bin/Debug/net7.0/AWA.Domain.pdb b/AWA.Services/bin/Debug/net7.0/AWA.Domain.pdb
diff --git a/AWA.Services/bin/Debug/net7.0/AWA.Services.dll b/AWA.Services/bin/Debug/net7.0/AWA.Services.dll
diff --git a/AWA.Services/bin/Debug/net7.0/AWA.Services.pdb b/AWA.Services/bin/Debug/net7.0/AWA.Services.pdb
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
diff --git a/AWA.Services/obj/Debug/net7.0/AWA.Services.dll b/AWA.Services/obj/Debug/net7.0/AWA.Services.dll
diff --git a/AWA.Services/obj/Debug/net7.0/AWA.Services.pdb b/AWA.Services/obj/Debug/net7.0/AWA.Services.pdb
diff --git a/AWA.Services/obj/Debug/net7.0/ref/AWA.Services.dll b/AWA.Services/obj/Debug/net7.0/ref/AWA.Services.dll
diff --git a/AWA.Services/obj/Debug/net7.0/refint/AWA.Services.dll b/AWA.Services/obj/Debug/net7.0/refint/AWA.Services.dll
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		fa3426309847ac656020e7966d6f021289e7e23a
		7753c791ba0f150fa627e8f6142fd033d9f31034
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0982d8982f0bfc2b35b5636025dcbbd0e8a2b241
		48a692c13b0359df347c3008e018440cbb6b43e8