diff --git a/MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs b/MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs index 44403ea..aab05cf 100644 --- a/MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs +++ b/MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs @@ -26,9 +26,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract }); _mapper = new Mapper(config); } - - public List GetList(bool onlyActive = true, string? email = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null, - DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null, string postId = null) + public List GetList(bool onlyActive = true, string? postId = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null, DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null) { try { @@ -37,9 +35,9 @@ internal class EmployeeStorageContract : IEmployeeStorageContract { query = query.Where(x => !x.IsDeleted); } - if (email is not null) + if (postId is not null) { - query = query.Where(x => x.PostId == email); + query = query.Where(x => x.PostId == postId); } if (fromBirthDate is not null && toBirthDate is not null) { @@ -155,7 +153,5 @@ internal class EmployeeStorageContract : IEmployeeStorageContract } } - private Employee? GetEmployeeById(string id) => _dbContext.Employees.FirstOrDefault(x => x.Id == id && !x.IsDeleted); - - + private Employee? GetEmployeeById(string id) => _dbContext.Employees.FirstOrDefault(x => x.Id == id && !x.IsDeleted); } diff --git a/MagicCarpetProject/MagicCarpetTests/Infrastructure/ConfigurationDatabaseTest.cs b/MagicCarpetProject/MagicCarpetTests/Infrastructure/ConfigurationDatabaseTest.cs index 3862745..78d3417 100644 --- a/MagicCarpetProject/MagicCarpetTests/Infrastructure/ConfigurationDatabaseTest.cs +++ b/MagicCarpetProject/MagicCarpetTests/Infrastructure/ConfigurationDatabaseTest.cs @@ -9,5 +9,5 @@ namespace MagicCarpetTests.Infrastructure; internal class ConfigurationDatabaseTest : IConfigurationDatabase { - public string ConnectionString => "Host=local;Port=5432;Database=MagicCarpetTest;Username=postgres;Password=postgres;"; + public string ConnectionString => "Host=127.0.0.1;Port=5432;Database=MagicCarpetTest;Username=postgres;Password=postgres;"; }