Esenia/PIbd-21_AndrianovaE.N._NorthBridgeProject
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Есения Андрианова 2025-02-02 00:40:47 +04:00
parent 2a1f550d05
commit 08d9251bdb
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NorthBridge/NorthBridgeContract/DataModels/BuyerDataModel.cs
View File

@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
namespace NorthBridgeContract.DataModels; namespace NorthBridgeContract.DataModels;
public class BuyerDataModel(string id, string fio, string phoneNumber, double discountSize) : IValidation public class BuyerDataModel(string id, string fio, string phoneNumber) : IValidation
{ {
public string Id { get; private set; } = id; public string Id { get; private set; } = id;
@ -13,8 +13,6 @@ public class BuyerDataModel(string id, string fio, string phoneNumber, double di
public string PhoneNumber { get; private set; } = phoneNumber; public string PhoneNumber { get; private set; } = phoneNumber;
public double DiscountSize { get; private set; } = discountSize;
public void Validate() public void Validate()
{ {
if (Id.IsEmpty()) if (Id.IsEmpty())
@ -31,5 +29,8 @@ public class BuyerDataModel(string id, string fio, string phoneNumber, double di
if (!Regex.IsMatch(PhoneNumber, @"^((8|\+7)[\- ]?)?(\(?\d{3}\)?[\- ]?)?[\d\- ]{7,10}$")) if (!Regex.IsMatch(PhoneNumber, @"^((8|\+7)[\- ]?)?(\(?\d{3}\)?[\- ]?)?[\d\- ]{7,10}$"))
throw new ValidationException("Field PhoneNumber is not a phone number"); throw new ValidationException("Field PhoneNumber is not a phone number");
if (!Regex.IsMatch(FIO, @"^[А-ЯЁ][а-яё]+(?:-[А-ЯЁ][а-яё]+)?\s[А-ЯЁ][а-яё]+(?:\s[А-ЯЁ][а-яё]+)?$"))
throw new ValidationException("Field FIO is not a fio");
} }
} }

26
NorthBridge/NorthBridgeTest/DataModelsTests/BuyerDataModelTests.cs
View File

@ -9,41 +9,41 @@ internal class BuyerDataModelTests
[Test] [Test]
public void IdIsNullOrEmptyTest() public void IdIsNullOrEmptyTest()
{ {
var buyer = CreateDataModel(null, "fio", "number", 10); var buyer = CreateDataModel(null, "Иванов Иван Иванович", "number");
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>()); Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
buyer = CreateDataModel(string.Empty, "fio", "number", 10); buyer = CreateDataModel(string.Empty, "Иванов Иван Иванович", "number");
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>()); Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void IdIsNotGuidTest() public void IdIsNotGuidTest()
{ {
var buyer = CreateDataModel("id", "fio", "number", 10); var buyer = CreateDataModel("id", "Иванов Иван Иванович", "number");
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>()); Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void FIOIsNullOrEmptyTest() public void FIOIsNullOrEmptyTest()
{ {
var buyer = CreateDataModel(Guid.NewGuid().ToString(), null, "number", 10); var buyer = CreateDataModel(Guid.NewGuid().ToString(), null, "number");
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>()); Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
buyer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "number", 10); buyer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "number");
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>()); Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void PhoneNumberIsNullOrEmptyTest() public void PhoneNumberIsNullOrEmptyTest()
{ {
var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", null, 10); var buyer = CreateDataModel(Guid.NewGuid().ToString(), "Иванов Иван Иванович", null);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>()); Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", string.Empty, 10); buyer = CreateDataModel(Guid.NewGuid().ToString(), "Иванов Иван Иванович", string.Empty);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>()); Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
} }
[Test] [Test]
public void PhoneNumberIsIncorrectTest() public void PhoneNumberIsIncorrectTest()
{ {
var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "777", 10); var buyer = CreateDataModel(Guid.NewGuid().ToString(), "Иванов Иван Иванович", "777");
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>()); Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
} }
@ -51,21 +51,19 @@ internal class BuyerDataModelTests
public void AllFieldsIsCorrectTest() public void AllFieldsIsCorrectTest()
{ {
var buyerId = Guid.NewGuid().ToString(); var buyerId = Guid.NewGuid().ToString();
var fio = "Fio"; var fio = "Иванов Иван Иванович";
var phoneNumber = "+7-777-777-77-77"; var phoneNumber = "+7-777-777-77-77";
var discountSize = 11; var buyer = CreateDataModel(buyerId, fio, phoneNumber);
var buyer = CreateDataModel(buyerId, fio, phoneNumber, discountSize);
Assert.That(() => buyer.Validate(), Throws.Nothing); Assert.That(() => buyer.Validate(), Throws.Nothing);
Assert.Multiple(() => Assert.Multiple(() =>
{ {
Assert.That(buyer.Id, Is.EqualTo(buyerId)); Assert.That(buyer.Id, Is.EqualTo(buyerId));
Assert.That(buyer.FIO, Is.EqualTo(fio)); Assert.That(buyer.FIO, Is.EqualTo(fio));
Assert.That(buyer.PhoneNumber, Is.EqualTo(phoneNumber)); Assert.That(buyer.PhoneNumber, Is.EqualTo(phoneNumber));
Assert.That(buyer.DiscountSize, Is.EqualTo(discountSize));
}); });
} }
private static BuyerDataModel CreateDataModel(string? id, string? fio, string? phoneNumber, double discountSize) => private static BuyerDataModel CreateDataModel(string? id, string? fio, string? phoneNumber) =>
new(id, fio, phoneNumber, discountSize); new(id, fio, phoneNumber);
} }