From 5e0e5f147e0ab7046a96287a8595060be0913902 Mon Sep 17 00:00:00 2001 From: Adelina888 Date: Thu, 13 Feb 2025 13:36:44 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PipingHot/DataModels/SaleDataModel.cs | 6 +- .../DataModels/SaleProductDataModel.cs | 8 +-- .../DataModelsTests/SaleDataModelTests.cs | 66 +++++++++---------- .../SaleProductDataModelTests.cs | 4 +- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/PipingHot/PipingHot/DataModels/SaleDataModel.cs b/PipingHot/PipingHot/DataModels/SaleDataModel.cs index 52a1709..4441fa3 100644 --- a/PipingHot/PipingHot/DataModels/SaleDataModel.cs +++ b/PipingHot/PipingHot/DataModels/SaleDataModel.cs @@ -9,15 +9,15 @@ using System.Threading.Tasks; namespace PipingHotContrast.DataModels; -public class SaleDataModel(string id, string workerId, string? restaurantId, double sum, bool isCancel, List products):IValidation +public class OrderDataModel(string id, string workerId, string? restaurantId, double sum, bool isCancel, List products):IValidation { public string Id { get; private set; } = id; public string WorkerId { get; private set; } = workerId; public string? RestaurantId { get; private set; } = restaurantId; - public DateTime SaleDate { get; private set; } + public DateTime OrderDate { get; private set; } public double Sum { get; private set; } = sum; public bool IsCancel { get; private set; } = isCancel; - public List Products { get; private set; } = products; + public List Products { get; private set; } = products; public void Validate() { diff --git a/PipingHot/PipingHot/DataModels/SaleProductDataModel.cs b/PipingHot/PipingHot/DataModels/SaleProductDataModel.cs index e98c937..5258155 100644 --- a/PipingHot/PipingHot/DataModels/SaleProductDataModel.cs +++ b/PipingHot/PipingHot/DataModels/SaleProductDataModel.cs @@ -10,17 +10,17 @@ using System.Threading.Tasks; namespace PipingHotContrast.DataModels; -public class SaleProductDataModel(string saleId, string productId, int count):IValidation +public class OrderProductDataModel(string saleId, string productId, int count):IValidation { - public string SaleId { get; private set; } = saleId; + public string OrderId { get; private set; } = saleId; public string ProductId { get; private set; } = productId; public int Count { get; private set; } = count; public void Validate() { - if (SaleId.IsEmpty()) + if (OrderId.IsEmpty()) throw new ValidationException("Field SaleId is empty"); - if (!SaleId.IsGuid()) + if (!OrderId.IsGuid()) throw new ValidationException("The value in the field SaleId is not a unique identifier"); if (ProductId.IsEmpty()) throw new ValidationException("Field ProductId is empty"); diff --git a/PipingHot/PipingHotTests/DataModelsTests/SaleDataModelTests.cs b/PipingHot/PipingHotTests/DataModelsTests/SaleDataModelTests.cs index aa8b21a..75ce942 100644 --- a/PipingHot/PipingHotTests/DataModelsTests/SaleDataModelTests.cs +++ b/PipingHot/PipingHotTests/DataModelsTests/SaleDataModelTests.cs @@ -14,86 +14,86 @@ internal class SaleDataModelTests [Test] public void IdIsNullOrEmptyTest() { - var sale = CreateDataModel(null, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); - sale = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); + var order = CreateDataModel(null, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); + order = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); } [Test] public void IdIsNotGuidTest() { - var sale = CreateDataModel("id", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); + var order = CreateDataModel("id", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); } [Test] public void WorkerIdIsNullOrEmptyTest() { - var sale = CreateDataModel(Guid.NewGuid().ToString(), null, Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); - sale = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); + var order = CreateDataModel(Guid.NewGuid().ToString(), null, Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); + order = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); } [Test] public void WorkerIdIsNotGuidTest() { - var sale = CreateDataModel(Guid.NewGuid().ToString(), "employeeId", Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); + var order = CreateDataModel(Guid.NewGuid().ToString(), "employeeId", Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); } [Test] public void RestaurantIdIsNotGuidTest() { - var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "restaurantId", 10, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); + var order = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "restaurantId", 10, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); } [Test] public void SumIsLessOrZeroTest() { - var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 0, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); - sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), -10, false, CreateSubDataModel()); - Assert.That(() => sale.Validate(), Throws.TypeOf()); + var order = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 0, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); + order = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), -10, false, CreateSubDataModel()); + Assert.That(() => order.Validate(), Throws.TypeOf()); } [Test] public void ProductsIsNullOrEmptyTest() { - var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, null); - Assert.That(() => sale.Validate(), Throws.TypeOf()); - sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, []); - Assert.That(() => sale.Validate(), Throws.TypeOf()); + var order = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, null); + Assert.That(() => order.Validate(), Throws.TypeOf()); + order = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, []); + Assert.That(() => order.Validate(), Throws.TypeOf()); } [Test] public void AllFieldsIsCorrectTest() { - var saleId = Guid.NewGuid().ToString(); + var orderId = Guid.NewGuid().ToString(); var workerId = Guid.NewGuid().ToString(); var restaurantId = Guid.NewGuid().ToString(); var sum = 10; var isCancel = true; var products = CreateSubDataModel(); - var sale = CreateDataModel(saleId, workerId, restaurantId, sum, isCancel, products); - Assert.That(() => sale.Validate(), Throws.Nothing); + var order = CreateDataModel(orderId, workerId, restaurantId, sum, isCancel, products); + Assert.That(() => order.Validate(), Throws.Nothing); Assert.Multiple(() => { - Assert.That(sale.Id, Is.EqualTo(saleId)); - Assert.That(sale.WorkerId, Is.EqualTo(workerId)); - Assert.That(sale.RestaurantId, Is.EqualTo(restaurantId)); - Assert.That(sale.Sum, Is.EqualTo(sum)); - Assert.That(sale.IsCancel, Is.EqualTo(isCancel)); - Assert.That(sale.Products, Is.EquivalentTo(products)); + Assert.That(order.Id, Is.EqualTo(orderId)); + Assert.That(order.WorkerId, Is.EqualTo(workerId)); + Assert.That(order.RestaurantId, Is.EqualTo(restaurantId)); + Assert.That(order.Sum, Is.EqualTo(sum)); + Assert.That(order.IsCancel, Is.EqualTo(isCancel)); + Assert.That(order.Products, Is.EquivalentTo(products)); }); } - private static SaleDataModel CreateDataModel(string? id, string? workerId, string? restaurantId, double sum, bool isCancel, List? products) => + private static OrderDataModel CreateDataModel(string? id, string? workerId, string? restaurantId, double sum, bool isCancel, List? products) => new(id, workerId, restaurantId, sum, isCancel, products); - private static List CreateSubDataModel() + private static List CreateSubDataModel() => [new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 1)]; } diff --git a/PipingHot/PipingHotTests/DataModelsTests/SaleProductDataModelTests.cs b/PipingHot/PipingHotTests/DataModelsTests/SaleProductDataModelTests.cs index 10da04d..01b7cc3 100644 --- a/PipingHot/PipingHotTests/DataModelsTests/SaleProductDataModelTests.cs +++ b/PipingHot/PipingHotTests/DataModelsTests/SaleProductDataModelTests.cs @@ -62,12 +62,12 @@ internal class SaleProductDataModelTests Assert.That(() => saleProduct.Validate(), Throws.Nothing); Assert.Multiple(() => { - Assert.That(saleProduct.SaleId, Is.EqualTo(saleId)); + Assert.That(saleProduct.OrderId, Is.EqualTo(saleId)); Assert.That(saleProduct.ProductId, Is.EqualTo(productId)); Assert.That(saleProduct.Count, Is.EqualTo(count)); }); } - private static SaleProductDataModel CreateDataModel(string? saleId, string? productId, int count) => + private static OrderProductDataModel CreateDataModel(string? saleId, string? productId, int count) => new(saleId, productId, count); }