From 08d9251bdba300f8a87ef67ca0cd38ed60856da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D1=81=D0=B5=D0=BD=D0=B8=D1=8F?= Date: Sun, 2 Feb 2025 00:40:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=201=20=D1=81=20=D0=B4=D0=BE=D0=BF=20=D1=80=D0=B5=D0=B3?= =?UTF-8?q?=D1=83=D0=BB=D1=8F=D1=80=D0=BD=D1=8B=D0=BC=20=D0=B2=D1=8B=D1=80?= =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataModels/BuyerDataModel.cs | 7 ++--- .../DataModelsTests/BuyerDataModelTests.cs | 26 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/NorthBridge/NorthBridgeContract/DataModels/BuyerDataModel.cs b/NorthBridge/NorthBridgeContract/DataModels/BuyerDataModel.cs index 17b7afa..22b6755 100644 --- a/NorthBridge/NorthBridgeContract/DataModels/BuyerDataModel.cs +++ b/NorthBridge/NorthBridgeContract/DataModels/BuyerDataModel.cs @@ -5,7 +5,7 @@ using System.Text.RegularExpressions; 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; @@ -13,8 +13,6 @@ public class BuyerDataModel(string id, string fio, string phoneNumber, double di public string PhoneNumber { get; private set; } = phoneNumber; - public double DiscountSize { get; private set; } = discountSize; - public void Validate() { 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}$")) 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"); } } \ No newline at end of file diff --git a/NorthBridge/NorthBridgeTest/DataModelsTests/BuyerDataModelTests.cs b/NorthBridge/NorthBridgeTest/DataModelsTests/BuyerDataModelTests.cs index 6206dca..6773c50 100644 --- a/NorthBridge/NorthBridgeTest/DataModelsTests/BuyerDataModelTests.cs +++ b/NorthBridge/NorthBridgeTest/DataModelsTests/BuyerDataModelTests.cs @@ -9,41 +9,41 @@ internal class BuyerDataModelTests [Test] public void IdIsNullOrEmptyTest() { - var buyer = CreateDataModel(null, "fio", "number", 10); + var buyer = CreateDataModel(null, "Иванов Иван Иванович", "number"); Assert.That(() => buyer.Validate(), Throws.TypeOf()); - buyer = CreateDataModel(string.Empty, "fio", "number", 10); + buyer = CreateDataModel(string.Empty, "Иванов Иван Иванович", "number"); Assert.That(() => buyer.Validate(), Throws.TypeOf()); } [Test] public void IdIsNotGuidTest() { - var buyer = CreateDataModel("id", "fio", "number", 10); + var buyer = CreateDataModel("id", "Иванов Иван Иванович", "number"); 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"); Assert.That(() => buyer.Validate(), Throws.TypeOf()); - buyer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "number", 10); + buyer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "number"); 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(), "Иванов Иван Иванович", null); Assert.That(() => buyer.Validate(), Throws.TypeOf()); - buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", string.Empty, 10); + buyer = CreateDataModel(Guid.NewGuid().ToString(), "Иванов Иван Иванович", string.Empty); 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(), "Иванов Иван Иванович", "777"); Assert.That(() => buyer.Validate(), Throws.TypeOf()); } @@ -51,21 +51,19 @@ internal class BuyerDataModelTests public void AllFieldsIsCorrectTest() { var buyerId = Guid.NewGuid().ToString(); - var fio = "Fio"; + var fio = "Иванов Иван Иванович"; var phoneNumber = "+7-777-777-77-77"; - var discountSize = 11; - var buyer = CreateDataModel(buyerId, fio, phoneNumber, discountSize); + var buyer = CreateDataModel(buyerId, fio, phoneNumber); 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.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) => + new(id, fio, phoneNumber); } \ No newline at end of file