From 331cdc335201937ca320d387d47b900bfd7291a4 Mon Sep 17 00:00:00 2001 From: cyxaruk Date: Sat, 15 Feb 2025 13:32:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=BD=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SPiluSZharu/DataModels/WorkerDataModel.cs | 11 ++++- .../DataModelsTests/WorkerDataModelTests.cs | 46 +++++++++++++------ 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/SPiluSZharu/SPiluSZharu/DataModels/WorkerDataModel.cs b/SPiluSZharu/SPiluSZharu/DataModels/WorkerDataModel.cs index cf7d468..c8edc85 100644 --- a/SPiluSZharu/SPiluSZharu/DataModels/WorkerDataModel.cs +++ b/SPiluSZharu/SPiluSZharu/DataModels/WorkerDataModel.cs @@ -5,11 +5,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; 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; @@ -17,6 +18,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; @@ -40,6 +43,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()})"); diff --git a/SPiluSZharu/SPiluSZharuTests/DataModelsTests/WorkerDataModelTests.cs b/SPiluSZharu/SPiluSZharuTests/DataModelsTests/WorkerDataModelTests.cs index 2537ebb..f8aba04 100644 --- a/SPiluSZharu/SPiluSZharuTests/DataModelsTests/WorkerDataModelTests.cs +++ b/SPiluSZharu/SPiluSZharuTests/DataModelsTests/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()); - 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()); } [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()); } [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()); - 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()); } [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()); - 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()); } [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()); + } + + [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()); + CreateDataModel(Guid.NewGuid().ToString(), "fio", "postId", string.Empty, DateTime.Now.AddYears(-16), DateTime.Now, false); + Assert.That(() => worker.Validate(), Throws.TypeOf()); + } + + [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()); } [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()); } [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()); - 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()); } @@ -69,16 +85,18 @@ 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)); @@ -86,6 +104,6 @@ internal class WorkerDataModelTests } - private static WorkerDataModel CreateDataModel(string? id, string? fio, string? postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) => - new(id, fio, postId, birthDate, employmentDate, isDeleted); + private static WorkerDataModel CreateDataModel(string? id, string? fio, string? postId, string? phoneNumber, DateTime birthDate, DateTime employmentDate, bool isDeleted) => + new(id, fio, postId, phoneNumber, birthDate, employmentDate, isDeleted); }