Bloody_Arthur/PIbd-24_Calimullin_A.R._TheSharikGiftShopProject
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Добавление новой проверки с использованием регулярного выражения

Browse Source
This commit is contained in:
artur-kalimullin 2025-02-10 19:13:03 +04:00
parent 24eb9d76dc
commit 4c15ad05db
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TheSharikGiftShopProject/SharikGiftShopContratcs/DataModels/BuyerDataModel.cs
View File

@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
namespace SharikGiftShopContratcs.DataModels;
public class BuyerDataModel(string id, string fio, string phoneNumber, double discountSize) : IValidation
public class BuyerDataModel(string id, string fio, string phoneNumber, string email, double discountSize) : IValidation
{
public string Id { get; private set; } = id;
@ -13,6 +13,8 @@ public class BuyerDataModel(string id, string fio, string phoneNumber, double di
public string PhoneNumber { get; private set; } = phoneNumber;
public string Email { get; private set; } = email;
public double DiscountSize { get; private set; } = discountSize;
public void Validate()
@ -31,5 +33,11 @@ public class BuyerDataModel(string id, string fio, string phoneNumber, double di
if (!Regex.IsMatch(PhoneNumber, @"^((8|\+7)[\- ]?)?(\(?\d{3}\)?[\- ]?)?[\d\- ]{7,10}$"))
throw new ValidationException("Field PhoneNumber is not a phone number");
if (Email.IsEmpty())
throw new ValidationException("Field Email is empty");
if (!Regex.IsMatch(Email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
throw new ValidationException("Field Email is not a valid email address");
}
}

41
TheSharikGiftShopProject/SharikGiftShopTests/DataModelsTests/BuyerDataModelTests.cs
View File

@ -9,41 +9,57 @@ internal class BuyerDataModelTests
[Test]
public void IdIsNullOrEmptyTest()
{
var buyer = CreateDataModel(null, "fio", "number", 10);
var buyer = CreateDataModel(null, "fio", "number", "email@example.com", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
buyer = CreateDataModel(string.Empty, "fio", "number", 10);
buyer = CreateDataModel(string.Empty, "fio", "number", "email@example.com", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
}
[Test]
public void IdIsNotGuidTest()
{
var buyer = CreateDataModel("id", "fio", "number", 10);
var buyer = CreateDataModel("id", "fio", "number", "email@example.com", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
}
[Test]
public void FIOIsNullOrEmptyTest()
{
var buyer = CreateDataModel(Guid.NewGuid().ToString(), null, "number", 10);
var buyer = CreateDataModel(Guid.NewGuid().ToString(), null, "number", "email@example.com", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
buyer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "number", 10);
buyer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "number", "email@example.com", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
}
[Test]
public void PhoneNumberIsNullOrEmptyTest()
{
var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", null, 10);
var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", null, "email@example.com", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", string.Empty, 10);
buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", string.Empty, "email@example.com", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
}
[Test]
public void PhoneNumberIsIncorrectTest()
{
var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "777", 10);
var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "777", "email@example.com", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
}
[Test]
public void EmailIsNullOrEmptyTest()
{
var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "number", null, 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "number", string.Empty, 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
}
[Test]
public void EmailIsIncorrectTest()
{
var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "number", "invalid-email", 10);
Assert.That(() => buyer.Validate(), Throws.TypeOf<ValidationException>());
}
@ -53,18 +69,21 @@ internal class BuyerDataModelTests
var buyerId = Guid.NewGuid().ToString();
var fio = "Fio";
var phoneNumber = "+7-777-777-77-77";
var email = "email@example.com";
var discountSize = 11;
var buyer = CreateDataModel(buyerId, fio, phoneNumber, discountSize);
var buyer = CreateDataModel(buyerId, fio, phoneNumber, email, discountSize);
Assert.That(() => buyer.Validate(), Throws.Nothing);
Assert.Multiple(() =>
{
Assert.That(buyer.Id, Is.EqualTo(buyerId));
Assert.That(buyer.FIO, Is.EqualTo(fio));
Assert.That(buyer.PhoneNumber, Is.EqualTo(phoneNumber));
Assert.That(buyer.Email, Is.EqualTo(email));
Assert.That(buyer.DiscountSize, Is.EqualTo(discountSize));
});
}
private static BuyerDataModel CreateDataModel(string? id, string? fio, string? phoneNumber, double discountSize) =>
new(id, fio, phoneNumber, discountSize);
private static BuyerDataModel CreateDataModel(string? id, string? fio, string? phoneNumber,
string? email, double discountSize) =>
new(id, fio, phoneNumber, email, discountSize);
}