добавил модель и тесты для зарплаты

добавил регулярное выражение и тесты для него

SPiluSZharuProject/SPiluSZharuContracts/DataModels/SalaryDataModel.cs

@@ -0,0 +1,26 @@
+using SPiluSZharuContracts.Exceptions;
+using SPiluSZharuContracts.Extensions;
+using SPiluSZharuContracts.Infrastructure;
+
+namespace SPiluSZharuContracts.DataModels;
+
+public class SalaryDataModel(string workerId, DateTime salaryDate, double workerSalary) : IValidation
+{
+    public string WorkerId { get; private set; } = workerId;
+
+    public DateTime SalaryDate { get; private set; } = salaryDate;
+
+    public double Salary { get; private set; } = workerSalary;
+
+    public void Validate()
+    {
+        if (WorkerId.IsEmpty())
+            throw new ValidationException("Field WorkerId is empty");
+
+        if (!WorkerId.IsGuid())
+            throw new ValidationException("The value in the field WorkerId is not a unique identifier");
+
+        if (Salary <= 0)
+            throw new ValidationException("Field Salary is less than or equal to 0");
+    }
+}

SPiluSZharuProject/SPiluSZharuContracts/DataModels/WorkerDataModel.cs

@@ -1,10 +1,11 @@
 using SPiluSZharuContracts.Exceptions;
 using SPiluSZharuContracts.Extensions;
 using SPiluSZharuContracts.Infrastructure;
+using System.Text.RegularExpressions;
 
 namespace SPiluSZharuContracts.DataModels;
 
-public class WorkerDataModel(string id, string fio, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) : IValidation
+public class WorkerDataModel(string id, string fio, string postId, string phoneNumber, DateTime birthDate, DateTime employmentDate, bool isDeleted) : IValidation
 {
     public string Id { get; private set; } = id;
 
@@ -12,6 +13,8 @@ public class WorkerDataModel(string id, string fio, string postId, DateTime birt
 
     public string PostId { get; private set; } = postId;
 
+    public string PhoneNumber { get; private set; } = phoneNumber;
+
     public DateTime BirthDate { get; private set; } = birthDate;
 
     public DateTime EmploymentDate { get; private set; } = employmentDate;
@@ -35,6 +38,12 @@ public class WorkerDataModel(string id, string fio, string postId, DateTime birt
         if (!PostId.IsGuid())
             throw new ValidationException("The value in the field PostId is not a unique identifier");
 
+        if (PhoneNumber.IsEmpty())
+            throw new ValidationException("Field PhoneNumber is empty");
+
+        if (!Regex.IsMatch(PhoneNumber, @"^(8|\+7)(\s|\(|\-)?(\d{3})(\s|\)|\-)?(\d{3})(\s|\-)?(\d{2})(\s|\-)?(\d{2})$"))
+            throw new ValidationException("Field PhoneNumber is not a phone number");
+
         if (BirthDate.Date > DateTime.Now.AddYears(-16).Date)
             throw new ValidationException($"Minors cannot be hired (BirthDate = {BirthDate.ToShortDateString()})");
 

SPiluSZharuProject/SPiluSZharuTests/DataModelTests/SalaryDataModelTests.cs

@@ -0,0 +1,52 @@
+using SPiluSZharuContracts.DataModels;
+using SPiluSZharuContracts.Exceptions;
+
+namespace SPiluSZharuTests.DataModelTests;
+
+[TestFixture]
+internal class SalaryDataModelTests
+{
+    [Test]
+    public void WorkerIdIsEmptyTest()
+    {
+        var salary = CreateDataModel(null, DateTime.Now, 10);
+        Assert.That(() => salary.Validate(), Throws.TypeOf<ValidationException>());
+        salary = CreateDataModel(string.Empty, DateTime.Now, 10);
+        Assert.That(() => salary.Validate(), Throws.TypeOf<ValidationException>());
+    }
+
+    [Test]
+    public void WorkerIdIsNotGuidTest()
+    {
+        var salary = CreateDataModel("workerId", DateTime.Now, 10);
+        Assert.That(() => salary.Validate(), Throws.TypeOf<ValidationException>());
+    }
+
+    [Test]
+    public void PriceIsLessOrZeroTest()
+    {
+        var salary = CreateDataModel(Guid.NewGuid().ToString(), DateTime.Now, 0);
+        Assert.That(() => salary.Validate(), Throws.TypeOf<ValidationException>());
+        salary = CreateDataModel(Guid.NewGuid().ToString(), DateTime.Now, -10);
+        Assert.That(() => salary.Validate(), Throws.TypeOf<ValidationException>());
+    }
+
+    [Test]
+    public void AllFieldsIsCorrectTest()
+    {
+        var workerId = Guid.NewGuid().ToString();
+        var salaryDate = DateTime.Now.AddDays(-3).AddMinutes(-5);
+        var workerSalary = 10;
+        var salary = CreateDataModel(workerId, salaryDate, workerSalary);
+        Assert.That(() => salary.Validate(), Throws.Nothing);
+        Assert.Multiple(() =>
+        {
+            Assert.That(salary.WorkerId, Is.EqualTo(workerId));
+            Assert.That(salary.SalaryDate, Is.EqualTo(salaryDate));
+            Assert.That(salary.Salary, Is.EqualTo(workerSalary));
+        });
+    }
+
+    private static SalaryDataModel CreateDataModel(string? workerId, DateTime salaryDate, double workerSalary) =>
+        new(workerId, salaryDate, workerSalary);
+}

SPiluSZharuProject/SPiluSZharuTests/DataModelTests/WorkerDataModelTests.cs

@@ -9,57 +9,73 @@ internal class WorkerDataModelTests
     [Test]
     public void IdIsNullOrEmptyTest()
     {
-        var worker = CreateDataModel(null, "fio", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16), DateTime.Now, false);
+        var worker = CreateDataModel(null, "fio", Guid.NewGuid().ToString(), "number", DateTime.Now.AddYears(-16), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
-        worker = CreateDataModel(string.Empty, "fio", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-18), DateTime.Now, false);
+        worker = CreateDataModel(string.Empty, "fio", Guid.NewGuid().ToString(), "number", DateTime.Now.AddYears(-18), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void IdIsNotGuidTest()
     {
-        var worker = CreateDataModel("id", "fio", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16), DateTime.Now, false);
+        var worker = CreateDataModel("id", "fio", Guid.NewGuid().ToString(), "number", DateTime.Now.AddYears(-16), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void FIOIsNullOrEmptyTest()
     {
-        var worker = CreateDataModel(Guid.NewGuid().ToString(), null, Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16), DateTime.Now, false);
+        var worker = CreateDataModel(Guid.NewGuid().ToString(), null, Guid.NewGuid().ToString(), "number", DateTime.Now.AddYears(-16), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
-        worker = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16), DateTime.Now, false);
+        worker = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, Guid.NewGuid().ToString(), "number", DateTime.Now.AddYears(-16), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void PostIdIsNullOrEmptyTest()
     {
-        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", null, DateTime.Now.AddYears(-16), DateTime.Now, false);
+        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", null, "number", DateTime.Now.AddYears(-16), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
-        worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", string.Empty, DateTime.Now.AddYears(-16), DateTime.Now, false);
+        worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", string.Empty, "number", DateTime.Now.AddYears(-16), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void PostIdIsNotGuidTest()
     {
-        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "postId", DateTime.Now.AddYears(-16), DateTime.Now, false);
+        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "postId", "number", DateTime.Now.AddYears(-16), DateTime.Now, false);
+        Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
+    }
+
+    [Test]
+    public void PhoneNumberIsNullOrEmptyTest()
+    {
+        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "postId", null, DateTime.Now.AddYears(-16), DateTime.Now, false);
+        Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
+        CreateDataModel(Guid.NewGuid().ToString(), "fio", "postId", string.Empty, DateTime.Now.AddYears(-16), DateTime.Now, false);
+        Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
+    }
+
+    [Test]
+    public void PhoneNumberIsIncorrectTest()
+    {
+        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "postId", "777", DateTime.Now.AddYears(-16), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void BirthDateIsNotCorrectTest()
     {
-        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16).AddDays(1), DateTime.Now, false);
+        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", Guid.NewGuid().ToString(), "number", DateTime.Now.AddYears(-16).AddDays(1), DateTime.Now, false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void BirthDateAndEmploymentDateIsNotCorrectTest()
     {
-        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16), DateTime.Now.AddYears(-16).AddDays(-1), false);
+        var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", Guid.NewGuid().ToString(), "number", DateTime.Now.AddYears(-16), DateTime.Now.AddYears(-16).AddDays(-1), false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
-        worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16), DateTime.Now.AddYears(-14), false);
+        worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", Guid.NewGuid().ToString(), "number", DateTime.Now.AddYears(-16), DateTime.Now.AddYears(-14), false);
         Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
     }
 
@@ -69,22 +85,24 @@ internal class WorkerDataModelTests
         var workerId = Guid.NewGuid().ToString();
         var fio = "fio";
         var postId = Guid.NewGuid().ToString();
+        var phoneNumber = "+7(777)777-77-77";
         var birthDate = DateTime.Now.AddYears(-16).AddDays(-1);
         var employmentDate = DateTime.Now;
         var isDelete = false;
-        var worker = CreateDataModel(workerId, fio, postId, birthDate, employmentDate, isDelete);
+        var worker = CreateDataModel(workerId, fio, postId, phoneNumber, birthDate, employmentDate, isDelete);
         Assert.That(() => worker.Validate(), Throws.Nothing);
         Assert.Multiple(() =>
         {
             Assert.That(worker.Id, Is.EqualTo(workerId));
             Assert.That(worker.FIO, Is.EqualTo(fio));
             Assert.That(worker.PostId, Is.EqualTo(postId));
+            Assert.That(worker.PhoneNumber, Is.EqualTo(phoneNumber));
             Assert.That(worker.BirthDate, Is.EqualTo(birthDate));
             Assert.That(worker.EmploymentDate, Is.EqualTo(employmentDate));
             Assert.That(worker.IsDeleted, Is.EqualTo(isDelete));
         });
     }
 
-    private static WorkerDataModel CreateDataModel(string? id, string? fio, string? postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) =>
+    private static WorkerDataModel CreateDataModel(string? id, string? fio, string? postId, string? phoneNumber, DateTime birthDate, DateTime employmentDate, bool isDeleted) =>
-        new(id, fio, postId, birthDate, employmentDate, isDeleted);
+        new(id, fio, postId, phoneNumber, birthDate, employmentDate, isDeleted);
 }