NeckerFree · NeckerFree · Jan 11, 2023 · Jan 11, 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/921da61d-8725-4793-9af7-6be8c6f21c57.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/921da61d-8725-4793-9af7-6be8c6f21c57.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/b16cd2fc-bf18-4f65-abed-8233f3935589.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/b16cd2fc-bf18-4f65-abed-8233f3935589.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/c6b0be24-e6ca-4444-a47d-6757fb6860f9.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/c6b0be24-e6ca-4444-a47d-6757fb6860f9.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/AdvancedWebAPI/v17/HierarchyCache.v1.txt b/.vs/AdvancedWebAPI/v17/HierarchyCache.v1.txt
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/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.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/DependencyInjection.cs b/AWA.Repository/DependencyInjection.cs
@@ -20,9 +20,6 @@ public static IServiceCollection AddDIServices(this IServiceCollection services,
                 options.UseSqlServer(connectionString);
             });
             services.AddScoped<IUnitOfWork, UnitOfWork>();
-            //services.AddScoped<IProductRepository, ProductRepository>();
-            //services.AddTransient<IBusinessEntityContactRepository, BusinessEntityContactRepository>();
-            //services.AddTransient<IContactTypeRepository, ContactTypeRepository>();
             services.AddTransient<IEmailAddressRepository, EmailAddressRepository>();
             services.AddTransient<IPersonRepository, PersonRepository>();
             services.AddTransient<IEmployeeRepository, EmployeeRepository>();

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.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.Services/PersonParameters.cs b/AWA.Services/PersonParameters.cs
@@ -2,10 +2,15 @@
 {
     public class PersonParameters : QueryStringParameters
     {
+        public PersonParameters()
+        {
+            OrderBy= "FullName";
+        }
         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; } = "";
+        public string OrderBy { get; set; }
     }
 }
diff --git a/AWA.Services/PersonService.cs b/AWA.Services/PersonService.cs
@@ -1,6 +1,8 @@
 using AWA.Domain.Interfaces;
 using AWA.Models;
 using AWA.Services.Interfaces;
+using System.Reflection;
+using System.Text;
 
 namespace AWA.Services
 {
@@ -39,17 +41,52 @@ join e in emailAddress on p.BusinessEntityId equals e.BusinessEntityId
 
         public PagedList<DTOPeople> GetPagedPeople(PersonParameters personParameters)
         {
-            var allPeople = GetAllPeople().Result.AsQueryable<DTOPeople>().OrderBy(so => so.FullName);
+            var allPeople = GetAllPeople().Result.AsQueryable<DTOPeople>();
+            var allPeopleSorted = OrderPeople(allPeople, personParameters.OrderBy);
             if (personParameters.MinYearOfBirth != null && personParameters.MaxYearOfBirth != null)
             {
-                allPeople = (IOrderedQueryable<DTOPeople>)allPeople
+                allPeopleSorted = (IOrderedQueryable<DTOPeople>)allPeopleSorted
                     .Where(o => o.BirthDate.Year >= personParameters.MinYearOfBirth && o.BirthDate.Year <= personParameters.MaxYearOfBirth);
             }
-            SearchPeople(ref allPeople, personParameters.Name, personParameters.JobTitle);
+            SearchPeople(allPeopleSorted, personParameters.Name, personParameters.JobTitle);
             return PagedList<DTOPeople>.ToPagedList(allPeople, personParameters.PageNumber, personParameters.PageSize);
         }
 
-        private void SearchPeople(ref IOrderedQueryable<DTOPeople> allPeople, string? name, string? jobTitle)
+        private IOrderedQueryable<DTOPeople> OrderPeople(IQueryable<DTOPeople> allPeople, string orderBy)
+        {
+            IOrderedQueryable < DTOPeople > allPeopleOrdered= (IOrderedQueryable<DTOPeople>)allPeople;
+            if (!allPeople.Any())
+            {
+                return allPeopleOrdered;
+            }
+            if (string.IsNullOrWhiteSpace(orderBy))
+            {
+                allPeopleOrdered.OrderBy(p => p.FullName);
+                return allPeopleOrdered;
+            }
+            var orderParameters = orderBy.Trim().Split(',');
+            var propertyInfos = typeof(DTOPeople).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            var orderQueryBuilder = new StringBuilder();
+            foreach (var orderParam in orderParameters)
+            {
+                if (string.IsNullOrWhiteSpace(orderParam)) continue;
+                var propertyQuery = orderParam.Split(' ')[0];
+                var objectProperty = propertyInfos.FirstOrDefault(pi => pi.Name.Equals(propertyQuery, StringComparison.InvariantCultureIgnoreCase));
+                if (objectProperty == null)                   continue;
+                var sortingOrder = orderParam.EndsWith(" desc") ? "descending" : "ascending";
+                var sortField = objectProperty.Name.ToString();
+                if (!string.IsNullOrWhiteSpace(sortField))
+                {
+                    var sortFieldOrder = $"{sortField} {sortingOrder}";
+                    allPeopleOrdered = allPeopleOrdered.OrderBy(p => sortFieldOrder);
+                }
+            }
+            return allPeopleOrdered;
+
+        }
+
+
+        private void SearchPeople(IOrderedQueryable<DTOPeople> allPeople, string? name, string? jobTitle)
         {
             if (allPeople.Any() == false) return;
             if (string.IsNullOrWhiteSpace(name) && string.IsNullOrWhiteSpace(jobTitle)) return;

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
diff --git a/README.md b/README.md
@@ -296,10 +296,6 @@ dotnet tool install --global dotnet-ef
 dotnet tool update --global dotnet-ef 
 
 
-BusinessEntityContactRepository
-ContactTypeRepository
-PersonRepository
-EmailAddressRepository
 
 https://code-maze.com/paging-aspnet-core-webapi/
 https://code-maze.com/filtering-aspnet-core-webapi/