cyxaruk/ISEbd-22_Platonov_A.M._SPiluSZharu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

добавил атрибут для сущности работник

Browse Source
This commit is contained in:
cyxaruk 2025-02-15 13:32:47 +04:00
parent c0057c5ba1
commit 331cdc3352
2 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SPiluSZharu/SPiluSZharu/DataModels/WorkerDataModel.cs
View File

@ -5,11 +5,12 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace SPiluSZharuContracts.DataModels; 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; 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 PostId { get; private set; } = postId;
public string PhoneNumber { get; private set; } = phoneNumber;
public DateTime BirthDate { get; private set; } = birthDate; public DateTime BirthDate { get; private set; } = birthDate;
public DateTime EmploymentDate { get; private set; } = employmentDate; 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()) if (!PostId.IsGuid())
throw new ValidationException("The value in the field PostId is not a unique identifier"); 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) if (BirthDate.Date > DateTime.Now.AddYears(-16).Date)
throw new ValidationException($"Minors cannot be hired (BirthDate = {BirthDate.ToShortDateString()})"); throw new ValidationException($"Minors cannot be hired (BirthDate = {BirthDate.ToShortDateString()})");

46
SPiluSZharu/SPiluSZharuTests/DataModelsTests/WorkerDataModelTests.cs
View File

@ -9,57 +9,73 @@ internal class WorkerDataModelTests
[Test] [Test]
public void IdIsNullOrEmptyTest() 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>()); 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>()); Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void IdIsNotGuidTest() 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>()); Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void FIOIsNullOrEmptyTest() 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>()); 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>()); Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void PostIdIsNullOrEmptyTest() 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>()); 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>()); Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void PostIdIsNotGuidTest() 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>()); Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void BirthDateIsNotCorrectTest() 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>()); Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void BirthDateAndEmploymentDateIsNotCorrectTest() 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>()); 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>()); Assert.That(() => worker.Validate(), Throws.TypeOf<ValidationException>());
} }
@ -69,16 +85,18 @@ internal class WorkerDataModelTests
var workerId = Guid.NewGuid().ToString(); var workerId = Guid.NewGuid().ToString();
var fio = "fio"; var fio = "fio";
var postId = Guid.NewGuid().ToString(); var postId = Guid.NewGuid().ToString();
var phoneNumber = "+7(777)777-77-77";
var birthDate = DateTime.Now.AddYears(-16).AddDays(-1); var birthDate = DateTime.Now.AddYears(-16).AddDays(-1);
var employmentDate = DateTime.Now; var employmentDate = DateTime.Now;
var isDelete = false; 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.That(() => worker.Validate(), Throws.Nothing);
Assert.Multiple(() => Assert.Multiple(() =>
{ {
Assert.That(worker.Id, Is.EqualTo(workerId)); Assert.That(worker.Id, Is.EqualTo(workerId));
Assert.That(worker.FIO, Is.EqualTo(fio)); Assert.That(worker.FIO, Is.EqualTo(fio));
Assert.That(worker.PostId, Is.EqualTo(postId)); Assert.That(worker.PostId, Is.EqualTo(postId));
Assert.That(worker.PhoneNumber, Is.EqualTo(phoneNumber));
Assert.That(worker.BirthDate, Is.EqualTo(birthDate)); Assert.That(worker.BirthDate, Is.EqualTo(birthDate));
Assert.That(worker.EmploymentDate, Is.EqualTo(employmentDate)); Assert.That(worker.EmploymentDate, Is.EqualTo(employmentDate));
Assert.That(worker.IsDeleted, Is.EqualTo(isDelete)); 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) => 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);
} }