From c12efe7f925a1a09c5e16889a82b4f6cf7c4226e Mon Sep 17 00:00:00 2001
From: xom9k <vfomicev586@gmail.com>
Date: Thu, 27 Feb 2025 09:12:07 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implementations/EmployeeStorageContract.cs              | 6 +++---
 MagicCarpetProject/MagicCarpetDatabase/Models/Employee.cs   | 4 ++--
 MagicCarpetProject/MagicCarpetDatabase/Models/Salary.cs     | 2 +-
 MagicCarpetProject/MagicCarpetDatabase/Models/Sale.cs       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs b/MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs
index f9f7cf4..0638115 100644
--- a/MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs
+++ b/MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs
@@ -27,7 +27,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         _mapper = new Mapper(config);
     }
 
-    public List<EmployeeDataModel> GetList(bool onlyActive = true, string? postId = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null,
+    public List<EmployeeDataModel> GetList(bool onlyActive = true, string? email = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null,
         DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null)
     {
         try
@@ -37,9 +37,9 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
             {
                 query = query.Where(x => !x.IsDeleted);
             }
-            if (postId is not null)
+            if (email is not null)
             {
-                query = query.Where(x => x.PostId == postId);
+                query = query.Where(x => x.PostId == email);
             }
             if (fromBirthDate is not null && toBirthDate is not null)
             {
diff --git a/MagicCarpetProject/MagicCarpetDatabase/Models/Employee.cs b/MagicCarpetProject/MagicCarpetDatabase/Models/Employee.cs
index 1d82297..f1babe4 100644
--- a/MagicCarpetProject/MagicCarpetDatabase/Models/Employee.cs
+++ b/MagicCarpetProject/MagicCarpetDatabase/Models/Employee.cs
@@ -13,9 +13,9 @@ internal class Employee
 
     public required string FIO { get; set; }
 
-    public string Email { get; set; } 
+    public required string PostId { get; set; }
 
-    public required string PostId { get; set; } 
+    public string? Email { get; set; }
 
     public DateTime BirthDate { get; set; }
 
diff --git a/MagicCarpetProject/MagicCarpetDatabase/Models/Salary.cs b/MagicCarpetProject/MagicCarpetDatabase/Models/Salary.cs
index 93b4bff..8ed7712 100644
--- a/MagicCarpetProject/MagicCarpetDatabase/Models/Salary.cs
+++ b/MagicCarpetProject/MagicCarpetDatabase/Models/Salary.cs
@@ -8,7 +8,7 @@ namespace MagicCarpetDatabase.Models;
 
 internal class Salary
 {
-    public required string Id { get; set; } = Guid.NewGuid().ToString();
+    public string Id { get; set; } = Guid.NewGuid().ToString();
     public required string EmployeeId { get; set; }
     public DateTime SalaryDate { get; set; } 
     public double EmployeeSalary { get; set; } 
diff --git a/MagicCarpetProject/MagicCarpetDatabase/Models/Sale.cs b/MagicCarpetProject/MagicCarpetDatabase/Models/Sale.cs
index b05bb03..f15d5c2 100644
--- a/MagicCarpetProject/MagicCarpetDatabase/Models/Sale.cs
+++ b/MagicCarpetProject/MagicCarpetDatabase/Models/Sale.cs
@@ -11,14 +11,14 @@ namespace MagicCarpetDatabase.Models;
 
 internal class Sale
 {
-    public required string Id { get; set; }
+    public string Id { get; set; } = Guid.NewGuid().ToString();
 
     public required string EmployeeId { get; set; } 
      
     public string? ClientId { get; set; } 
 
     public DateTime SaleDate { get; set; } 
-    public double Sum { get; private set; } 
+    public double Sum { get; set; } 
 
     public DiscountType DiscountType { get; set; }