From 4c15ad05dba8d177382611621f352287de5f1cd3 Mon Sep 17 00:00:00 2001 From: artur-kalimullin <144933634+artur-kalimullin@users.noreply.github.com> Date: Mon, 10 Feb 2025 19:13:03 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D1=81=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=D0=BC=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F=D1=80?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B2=D1=8B=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataModels/BuyerDataModel.cs | 10 ++++- .../DataModelsTests/BuyerDataModelTests.cs | 41 ++++++++++++++----- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/TheSharikGiftShopProject/SharikGiftShopContratcs/DataModels/BuyerDataModel.cs b/TheSharikGiftShopProject/SharikGiftShopContratcs/DataModels/BuyerDataModel.cs index 03c2276..92164b0 100644 --- a/TheSharikGiftShopProject/SharikGiftShopContratcs/DataModels/BuyerDataModel.cs +++ b/TheSharikGiftShopProject/SharikGiftShopContratcs/DataModels/BuyerDataModel.cs @@ -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"); } } \ No newline at end of file diff --git a/TheSharikGiftShopProject/SharikGiftShopTests/DataModelsTests/BuyerDataModelTests.cs b/TheSharikGiftShopProject/SharikGiftShopTests/DataModelsTests/BuyerDataModelTests.cs index 314f884..3e364ff 100644 --- a/TheSharikGiftShopProject/SharikGiftShopTests/DataModelsTests/BuyerDataModelTests.cs +++ b/TheSharikGiftShopProject/SharikGiftShopTests/DataModelsTests/BuyerDataModelTests.cs @@ -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()); - buyer = CreateDataModel(string.Empty, "fio", "number", 10); + buyer = CreateDataModel(string.Empty, "fio", "number", "email@example.com", 10); Assert.That(() => buyer.Validate(), Throws.TypeOf()); } [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()); } [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()); - 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()); } [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()); - 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()); } [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()); + } + + [Test] + public void EmailIsNullOrEmptyTest() + { + var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "number", null, 10); + Assert.That(() => buyer.Validate(), Throws.TypeOf()); + buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "number", string.Empty, 10); + Assert.That(() => buyer.Validate(), Throws.TypeOf()); + } + + [Test] + public void EmailIsIncorrectTest() + { + var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "number", "invalid-email", 10); Assert.That(() => buyer.Validate(), Throws.TypeOf()); } @@ -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); } \ No newline at end of file