NeckerFree · NeckerFree · Jan 7, 2023 · Jan 7, 2023
diff --git a/.vs/AdvancedWebAPI/DesignTimeBuild/.dtbcache.v2 b/.vs/AdvancedWebAPI/DesignTimeBuild/.dtbcache.v2
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/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/d2f16d84-93cc-483d-8b6e-5ffb3f476c65.vsidx b/.vs/AdvancedWebAPI/FileContentIndex/d2f16d84-93cc-483d-8b6e-5ffb3f476c65.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/IUnitOfWork.cs b/AWA.Domain/Interfaces/IUnitOfWork.cs
@@ -2,8 +2,8 @@
 {
     public interface IUnitOfWork : IDisposable
     {
-        IBusinessEntityContactRepository BusinessEntityContacts { get; }
-        IContactTypeRepository ContactTypes { get; }
+        //IBusinessEntityContactRepository BusinessEntityContacts { get; }
+        //IContactTypeRepository ContactTypes { get; }
         IPersonRepository People { get; }
         IEmailAddressRepository EmailAddresses { get; }
         IEmployeeRepository Employees { get; }

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.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/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/DependencyInjection.cs b/AWA.Repository/DependencyInjection.cs
@@ -11,7 +11,7 @@
 
 namespace AWA.Repository
 {
-    public static class DependencyInjection
+    public static class DependencyInjection 
     {
         public static IServiceCollection AddDIServices(this IServiceCollection services, string connectionString)
         {
@@ -21,11 +21,12 @@ public static IServiceCollection AddDIServices(this IServiceCollection services,
             });
             services.AddScoped<IUnitOfWork, UnitOfWork>();
             //services.AddScoped<IProductRepository, ProductRepository>();
-            services.AddTransient<IBusinessEntityContactRepository, BusinessEntityContactRepository>();
-            services.AddTransient<IContactTypeRepository, ContactTypeRepository>();
+            //services.AddTransient<IBusinessEntityContactRepository, BusinessEntityContactRepository>();
+            //services.AddTransient<IContactTypeRepository, ContactTypeRepository>();
             services.AddTransient<IEmailAddressRepository, EmailAddressRepository>();
             services.AddTransient<IPersonRepository, PersonRepository>();
-
+            services.AddTransient<IEmployeeRepository, EmployeeRepository>();
+
             return services;
         }
     }

diff --git a/AWA.Repository/EmployeeRepository.cs b/AWA.Repository/EmployeeRepository.cs
@@ -4,7 +4,7 @@
 
 namespace AWA.Repository
 {
-    internal class EmployeeRepository : GenericRepository<Employee>, IEmployeeRepository
+    public class EmployeeRepository : GenericRepository<Employee>, IEmployeeRepository
     {
         public EmployeeRepository(AdventureWorksContext context) : base(context)
         {

diff --git a/AWA.Repository/UnitOfWork.cs b/AWA.Repository/UnitOfWork.cs
@@ -8,9 +8,9 @@ public class UnitOfWork : IUnitOfWork
 
         private readonly AdventureWorksContext _dbContext;
 
-        public IBusinessEntityContactRepository BusinessEntityContacts { get; }
+        //public IBusinessEntityContactRepository BusinessEntityContacts { get; }
 
-        public IContactTypeRepository ContactTypes { get; }
+        //public IContactTypeRepository ContactTypes { get; }
 
         public IPersonRepository People { get; }
 
@@ -19,18 +19,18 @@ public class UnitOfWork : IUnitOfWork
         public IEmployeeRepository Employees { get; }
 
         public UnitOfWork(AdventureWorksContext dbContext,
-                            IBusinessEntityContactRepository businessEntityContactRepository,
-                            IContactTypeRepository contactTypeRepository,
+                            //IBusinessEntityContactRepository businessEntityContactRepository,
+                            //IContactTypeRepository contactTypeRepository,
                             IPersonRepository personRepository,
                             IEmailAddressRepository emailAddressRepository,
-                            IEmployeeRepository employee)
+                            IEmployeeRepository employeeRepository)
         {
             this._dbContext = dbContext;
-            this.BusinessEntityContacts = businessEntityContactRepository;
-            this.ContactTypes = contactTypeRepository;
+            //this.BusinessEntityContacts = businessEntityContactRepository;
+            //this.ContactTypes = contactTypeRepository;
             this.People = personRepository;
             this.EmailAddresses = emailAddressRepository;
-            this.Employees = employee;
+            this.Employees = employeeRepository;
         }
 
         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
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.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
@@ -3,7 +3,6 @@
     public class DTOPeople
     {
         public int BusinessEntityId { 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; }

diff --git a/AWA.Services/PersonService.cs b/AWA.Services/PersonService.cs
@@ -14,27 +14,36 @@ public PersonService(IUnitOfWork unitOfWork)
         }
         public async Task<IEnumerable<DTOPeople>> GetAllPeople()
         {
-            var businessEntityContact = await _unitOfWork.BusinessEntityContacts.GetAll();
-            var contactType = await _unitOfWork.ContactTypes.GetAll();
+            //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();
-            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
+            var employees = await _unitOfWork.Employees.GetAll();
+            var result = (from p in people
                           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 }
+                          join e in emailAddress on p.BusinessEntityId equals e.BusinessEntityId
+                          select new DTOPeople
+                          {
+                              BusinessEntityId = p.BusinessEntityId,
+                              Title = p.Title,
+                              FirstName = p.FirstName,
+                              LastName = p.LastName,
+                              EmailAddress = e.EmailAddress1,
+                              BirthDate = em.BirthDate,
+                              JobTitle = em.JobTitle
+                          }
                           );
             return result;
         }
 
+
+
         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.Name);
-           return PagedList<DTOPeople>.ToPagedList(allPeople, personParameters.PageNumber, personParameters.PageSize);
+            var allPeople = GetAllPeople().Result.AsQueryable<DTOPeople>()
+                 .Where(o => o.BirthDate.Year >= personParameters.MinYearOfBirth && o.BirthDate.Year <= personParameters.MaxYearOfBirth)
+                 .OrderBy(so => so.FirstName);
+            return PagedList<DTOPeople>.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
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