From a70fb3710c37a50dcabb5b39105aa65e8c2710d4 Mon Sep 17 00:00:00 2001 From: 145Game Date: Mon, 3 Feb 2025 21:28:21 +0400 Subject: [PATCH 1/4] =?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=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataModels/PostDataModel.cs | 58 +++++++++++++++++++ .../DataModels/ProductDataModel.cs | 46 +++++++++++++++ .../DataModels/ProductForSaleDataModel.cs | 39 +++++++++++++ .../DataModels/ProductHistoryDataModel.cs | 33 +++++++++++ .../DataModels/SalaryDataModel.cs | 33 +++++++++++ .../DataModels/SaleDataModel.cs | 51 ++++++++++++++++ .../DataModels/WorkerDataModelcs.cs | 56 ++++++++++++++++++ .../North_Bridge_Contract/Enums/PostType.cs | 16 +++++ .../Enums/ProductType.cs | 17 ++++++ .../Exceptions/ValidationException.cs | 15 +++++ .../Extentions/StringExtentions.cs | 21 +++++++ .../Infrastructure/IValidation.cs | 12 ++++ 12 files changed, 397 insertions(+) create mode 100644 North_Bridge/North_Bridge_Contract/DataModels/PostDataModel.cs create mode 100644 North_Bridge/North_Bridge_Contract/DataModels/ProductDataModel.cs create mode 100644 North_Bridge/North_Bridge_Contract/DataModels/ProductForSaleDataModel.cs create mode 100644 North_Bridge/North_Bridge_Contract/DataModels/ProductHistoryDataModel.cs create mode 100644 North_Bridge/North_Bridge_Contract/DataModels/SalaryDataModel.cs create mode 100644 North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs create mode 100644 North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModelcs.cs create mode 100644 North_Bridge/North_Bridge_Contract/Enums/PostType.cs create mode 100644 North_Bridge/North_Bridge_Contract/Enums/ProductType.cs create mode 100644 North_Bridge/North_Bridge_Contract/Exceptions/ValidationException.cs create mode 100644 North_Bridge/North_Bridge_Contract/Extentions/StringExtentions.cs create mode 100644 North_Bridge/North_Bridge_Contract/Infrastructure/IValidation.cs diff --git a/North_Bridge/North_Bridge_Contract/DataModels/PostDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/PostDataModel.cs new file mode 100644 index 0000000..73e5d11 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/DataModels/PostDataModel.cs @@ -0,0 +1,58 @@ +using North_Bridge_Contract.Infrastructure; +using North_Bridge_Contract.Enums; +using North_Bridge_Contract.Extentions; +using North_Bridge_Contract.Exceptions; + +namespace North_Bridge_Contract.DataModels; + +public class PostDataModel : IValidation +{ + public string Id { get; private set; } + + public string PostId { get; private set; } + + public string PostName { get; private set; } + + public PostType PostType { get; private set; } + + public double Salary { get; private set; } + + public bool IsActual { get; private set; } + + public DateTime ChangeDate { get; private set; } + + public PostDataModel(string id, string postId, string postName, PostType postType, double salary, bool isActual, DateTime changeDate) + { + Id = id; + PostId = postId; + PostName = postName; + PostType = postType; + Salary = salary; + IsActual = isActual; + ChangeDate = changeDate; + } + + public void Validate() + { + if (Id.IsEmpty()) + throw new ValidationException("Field Id is empty"); + + if (!Id.IsGuid()) + throw new ValidationException("The value in the field Id is not a unique identifier"); + + if (PostId.IsEmpty()) + throw new ValidationException("Field PostId is empty"); + + if (!PostId.IsGuid()) + throw new ValidationException("The value in the field PostId is not a unique identifier"); + + if (PostName.IsEmpty()) + throw new ValidationException("Field PostName is empty"); + + if (PostType == PostType.None) + throw new ValidationException("Field PostType is empty"); + + if (Salary <= 0) + throw new ValidationException("Field Salary is empty"); + } +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/DataModels/ProductDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/ProductDataModel.cs new file mode 100644 index 0000000..1aacca8 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/DataModels/ProductDataModel.cs @@ -0,0 +1,46 @@ +using North_Bridge_Contract.Enums; +using North_Bridge_Contract.Exceptions; +using North_Bridge_Contract.Extentions; +using North_Bridge_Contract.Infrastructure; + +namespace North_Bridge_Contract.DataModels; + +public class ProductDataModel : IValidation +{ + public string Id { get; private set; } + + public string ProductName { get; private set; } + + public ProductType ProductType { get; private set; } + + public double Price { get; private set; } + + public bool IsDeleted { get; private set; } + + public ProductDataModel(string id, string productName, ProductType productType, double price, bool isDeleted) + { + Id = id; + ProductName = productName; + ProductType = productType; + Price = price; + IsDeleted = isDeleted; + } + + public void Validate() + { + if (Id.IsEmpty()) + throw new ValidationException("Field Id is empty"); + + if (!Id.IsGuid()) + throw new ValidationException("The value in the field Id is not a unique identifier"); + + if (ProductName.IsEmpty()) + throw new ValidationException("Field ProductName is empty"); + + if (ProductType == ProductType.None) + throw new ValidationException("Field ProductType is empty"); + + if (Price <= 0) + throw new ValidationException("Field Price is less than or equal to 0"); + } +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/DataModels/ProductForSaleDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/ProductForSaleDataModel.cs new file mode 100644 index 0000000..e272b3f --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/DataModels/ProductForSaleDataModel.cs @@ -0,0 +1,39 @@ +using North_Bridge_Contract.Exceptions; +using North_Bridge_Contract.Extentions; +using North_Bridge_Contract.Infrastructure; + +namespace North_Bridge_Contract.DataModels; + +public class ProductForSaleDataModel : IValidation +{ + public string SaleId { get; private set; } + + public string ProductId { get; private set; } + + public int Count { get; private set; } + + public ProductForSaleDataModel(string saleId, string productId, int count) + { + SaleId = saleId; + ProductId = productId; + Count = count; + } + + public void Validate() + { + if (SaleId.IsEmpty()) + throw new ValidationException("Field SaleId is empty"); + + if (!SaleId.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"); + + if (!ProductId.IsGuid()) + throw new ValidationException("The value in the field ProductId is not a unique identifier"); + + if (Count <= 0) + throw new ValidationException("Field Count is less than or equal to 0"); + } +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/DataModels/ProductHistoryDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/ProductHistoryDataModel.cs new file mode 100644 index 0000000..0ef0774 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/DataModels/ProductHistoryDataModel.cs @@ -0,0 +1,33 @@ +using North_Bridge_Contract.Exceptions; +using North_Bridge_Contract.Extentions; +using North_Bridge_Contract.Infrastructure; + +namespace North_Bridge_Contract.DataModels; + +public class ProductHistoryDataModel : IValidation +{ + public string ProductId { get; private set; } + + public double OldPrice { get; private set; } + + public DateTime ChangeDate { get; private set; } + + public ProductHistoryDataModel(string productId, double oldPrice) + { + ProductId = productId; + OldPrice = oldPrice; + ChangeDate = DateTime.UtcNow; + } + + public void Validate() + { + if (ProductId.IsEmpty()) + throw new ValidationException("Field ProductId is empty"); + + if (!ProductId.IsGuid()) + throw new ValidationException("The value in the field ProductId is not a unique identifier"); + + if (OldPrice <= 0) + throw new ValidationException("Field OldPrice is less than or equal to 0"); + } +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/DataModels/SalaryDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/SalaryDataModel.cs new file mode 100644 index 0000000..b5267ac --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/DataModels/SalaryDataModel.cs @@ -0,0 +1,33 @@ +using North_Bridge_Contract.Exceptions; +using North_Bridge_Contract.Extentions; +using North_Bridge_Contract.Infrastructure; + +namespace North_Bridge_Contract.DataModels; + +public class SalaryDataModel : IValidation +{ + public string WorkerId { get; private set; } + + public DateTime SalaryDate { get; private set; } + + public double Salary { get; private set; } + + public SalaryDataModel(string workerId, DateTime salaryDate, double salary) + { + WorkerId = workerId; + SalaryDate = salaryDate; + Salary = salary; + } + + public void Validate() + { + if (WorkerId.IsEmpty()) + throw new ValidationException("Field WorkerId is empty"); + + if (!WorkerId.IsGuid()) + throw new ValidationException("The value in the field WorkerId is not a unique identifier"); + + if (Salary <= 0) + throw new ValidationException("Field Salary is less than or equal to 0"); + } +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs new file mode 100644 index 0000000..c15d1d1 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs @@ -0,0 +1,51 @@ +using North_Bridge_Contract.Exceptions; +using North_Bridge_Contract.Extentions; +using North_Bridge_Contract.Infrastructure; + +namespace North_Bridge_Contract.DataModels; + +public class SaleDataModel : IValidation +{ + public string Id { get; private set; } + + public string WorkerId { get; private set; } + + public DateTime SaleDate { get; private set; } + + public double Sum { get; private set; } + + public bool IsCansel { get; private set; } + + public List Products { get; private set; } + + public SaleDataModel(string id, string workerId, DateTime saleDate, double sum, bool isCansel, List products) + { + Id = id; + WorkerId = workerId; + SaleDate = saleDate; + Sum = sum; + IsCansel = isCansel; + Products = products; + } + + public void Validate() + { + if (Id.IsEmpty()) + throw new ValidationException("Field Id is empty"); + + if (!Id.IsGuid()) + throw new ValidationException("The value in the field Id is not a unique identifier"); + + if (WorkerId.IsEmpty()) + throw new ValidationException("Field WorkerId is empty"); + + if (!WorkerId.IsGuid()) + throw new ValidationException("The value in the field WorkerId is not a unique identifier"); + + if (Sum <= 0) + throw new ValidationException("Field Sum is less than or equal to 0"); + + if ((Products?.Count ?? 0) == 0) + throw new ValidationException("The sale must include products"); + } +} diff --git a/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModelcs.cs b/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModelcs.cs new file mode 100644 index 0000000..687d440 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModelcs.cs @@ -0,0 +1,56 @@ +using North_Bridge_Contract.Exceptions; +using North_Bridge_Contract.Extentions; +using North_Bridge_Contract.Infrastructure; +namespace North_Bridge_Contract.DataModels; + +public class WorkerDataModelcs : IValidation +{ + public string Id { get; private set; } + + public string FIO { get; private set; } + + public string PostId { get; private set; } + + public DateTime BirthDate { get; private set; } + + public DateTime EmploymentDate { get; private set; } + + public bool IsDeleted { get; private set; } + + public WorkerDataModelcs(string id, string fio, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) + { + Id = id; + FIO = fio; + PostId = postId; + BirthDate = birthDate; + EmploymentDate = employmentDate; + IsDeleted = isDeleted; + } + + public void Validate() + { + if (Id.IsEmpty()) + throw new ValidationException("Field Id is empty"); + + if (!Id.IsGuid()) + throw new ValidationException("The value in the field Id is not a unique identifier"); + + if (FIO.IsEmpty()) + throw new ValidationException("Field FIO is empty"); + + if (PostId.IsEmpty()) + throw new ValidationException("Field PostId is empty"); + + if (!PostId.IsGuid()) + throw new ValidationException("The value in the field PostId is not a unique identifier"); + + if (BirthDate.Date > DateTime.Now.AddYears(-16).Date) + throw new ValidationException($"Minors cannot be hired (BirthDate = { BirthDate.ToShortDateString() })"); + + if (EmploymentDate.Date < BirthDate.Date) + throw new ValidationException("The date of employment cannot be less than the date of birth"); + + if ((EmploymentDate - BirthDate).TotalDays / 365 < 16) // EmploymentDate.Year - BirthDate.Year + throw new ValidationException($"Minors cannot be hired (EmploymentDate - { EmploymentDate.ToShortDateString() }, BirthDate - { BirthDate.ToShortDateString()})"); + } +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/Enums/PostType.cs b/North_Bridge/North_Bridge_Contract/Enums/PostType.cs new file mode 100644 index 0000000..2ad48fd --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/Enums/PostType.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace North_Bridge_Contract.Enums; + +public enum PostType +{ + None = 0, + Supervisor = 1, + Cashier = 2, + Loader = 3, + Consultant = 4 +} diff --git a/North_Bridge/North_Bridge_Contract/Enums/ProductType.cs b/North_Bridge/North_Bridge_Contract/Enums/ProductType.cs new file mode 100644 index 0000000..247bf66 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/Enums/ProductType.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace North_Bridge_Contract.Enums; + +[Flags] +public enum ProductType +{ + None = 0, + SystemUnit = 1, + Monitor = 2, + ComputerMouse = 4, + AudioSystem = 8 +} diff --git a/North_Bridge/North_Bridge_Contract/Exceptions/ValidationException.cs b/North_Bridge/North_Bridge_Contract/Exceptions/ValidationException.cs new file mode 100644 index 0000000..f5670c6 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/Exceptions/ValidationException.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace North_Bridge_Contract.Exceptions; + +public class ValidationException : Exception +{ + public ValidationException(string message) : base(message) + { + + } +} diff --git a/North_Bridge/North_Bridge_Contract/Extentions/StringExtentions.cs b/North_Bridge/North_Bridge_Contract/Extentions/StringExtentions.cs new file mode 100644 index 0000000..5f26a74 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/Extentions/StringExtentions.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace North_Bridge_Contract.Extentions; + +public static class StringExtentions +{ + + public static bool IsEmpty(this string str) + { + return string.IsNullOrWhiteSpace(str); + } + + public static bool IsGuid(this string str) + { + return Guid.TryParse(str, out _); + } +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/Infrastructure/IValidation.cs b/North_Bridge/North_Bridge_Contract/Infrastructure/IValidation.cs new file mode 100644 index 0000000..293ba43 --- /dev/null +++ b/North_Bridge/North_Bridge_Contract/Infrastructure/IValidation.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace North_Bridge_Contract.Infrastructure; + +public interface IValidation +{ + void Validate(); +} -- 2.25.1 From b969fedba2d8ea909a88cbd86ae17c0ca34c6ea6 Mon Sep 17 00:00:00 2001 From: 145Game Date: Tue, 4 Feb 2025 23:14:41 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- North_Bridge/North_Bridge.sln | 6 + .../DataModels/SaleDataModel.cs | 15 ++- ...orkerDataModelcs.cs => WorkerDataModel.cs} | 11 +- .../North_Bridge_Contract/Enums/PostType.cs | 9 +- .../Enums/ProductType.cs | 9 +- .../Exceptions/ValidationException.cs | 9 +- .../Extentions/StringExtentions.cs | 7 +- .../Infrastructure/IValidation.cs | 9 +- .../DataModelsTests/PostDataModelTests.cs | 106 +++++++++++++++ .../DataModelsTests/ProductDataModelTests.cs | 87 ++++++++++++ .../ProductForSaleDataModelTests.cs | 76 +++++++++++ .../ProductHistoryDataModelTests.cs | 58 ++++++++ .../DataModelsTests/SalaryDataModelTests.cs | 57 ++++++++ .../DataModelsTests/SaleDataModelTestscs.cs | 92 +++++++++++++ .../DataModelsTests/WorkerDataModelTests.cs | 124 ++++++++++++++++++ .../North_Bridge_Tests.csproj | 28 ++++ 16 files changed, 664 insertions(+), 39 deletions(-) rename North_Bridge/North_Bridge_Contract/DataModels/{WorkerDataModelcs.cs => WorkerDataModel.cs} (80%) create mode 100644 North_Bridge/North_Bridge_Tests/DataModelsTests/PostDataModelTests.cs create mode 100644 North_Bridge/North_Bridge_Tests/DataModelsTests/ProductDataModelTests.cs create mode 100644 North_Bridge/North_Bridge_Tests/DataModelsTests/ProductForSaleDataModelTests.cs create mode 100644 North_Bridge/North_Bridge_Tests/DataModelsTests/ProductHistoryDataModelTests.cs create mode 100644 North_Bridge/North_Bridge_Tests/DataModelsTests/SalaryDataModelTests.cs create mode 100644 North_Bridge/North_Bridge_Tests/DataModelsTests/SaleDataModelTestscs.cs create mode 100644 North_Bridge/North_Bridge_Tests/DataModelsTests/WorkerDataModelTests.cs create mode 100644 North_Bridge/North_Bridge_Tests/North_Bridge_Tests.csproj diff --git a/North_Bridge/North_Bridge.sln b/North_Bridge/North_Bridge.sln index 23eec90..1abbfaf 100644 --- a/North_Bridge/North_Bridge.sln +++ b/North_Bridge/North_Bridge.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 17.7.34024.191 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "North_Bridge_Contract", "North_Bridge_Contract\North_Bridge_Contract.csproj", "{ED71153A-12DC-4E38-8BF8-1845F1D1D950}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "North_Bridge_Tests", "North_Bridge_Tests\North_Bridge_Tests.csproj", "{D77A42DA-D116-49A5-A735-95B5AC7B6D5D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {ED71153A-12DC-4E38-8BF8-1845F1D1D950}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED71153A-12DC-4E38-8BF8-1845F1D1D950}.Release|Any CPU.ActiveCfg = Release|Any CPU {ED71153A-12DC-4E38-8BF8-1845F1D1D950}.Release|Any CPU.Build.0 = Release|Any CPU + {D77A42DA-D116-49A5-A735-95B5AC7B6D5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D77A42DA-D116-49A5-A735-95B5AC7B6D5D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D77A42DA-D116-49A5-A735-95B5AC7B6D5D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D77A42DA-D116-49A5-A735-95B5AC7B6D5D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs index c15d1d1..544d8b0 100644 --- a/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs +++ b/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs @@ -14,17 +14,26 @@ public class SaleDataModel : IValidation public double Sum { get; private set; } - public bool IsCansel { get; private set; } + public bool IsCancel { get; private set; } public List Products { get; private set; } - public SaleDataModel(string id, string workerId, DateTime saleDate, double sum, bool isCansel, List products) + public SaleDataModel(string id, string workerId, DateTime saleDate, double sum, bool isCancel, List products) { Id = id; WorkerId = workerId; SaleDate = saleDate; Sum = sum; - IsCansel = isCansel; + IsCancel = isCancel; + Products = products; + } + + public SaleDataModel(string? id, string? workerId, double sum, bool isCancel, List? products) + { + Id = id; + WorkerId = workerId; + Sum = sum; + IsCancel = isCancel; Products = products; } diff --git a/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModelcs.cs b/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModel.cs similarity index 80% rename from North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModelcs.cs rename to North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModel.cs index 687d440..b09cd89 100644 --- a/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModelcs.cs +++ b/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModel.cs @@ -1,14 +1,17 @@ using North_Bridge_Contract.Exceptions; using North_Bridge_Contract.Extentions; using North_Bridge_Contract.Infrastructure; +using System.Text.RegularExpressions; namespace North_Bridge_Contract.DataModels; -public class WorkerDataModelcs : IValidation +public class WorkerDataModel : IValidation { public string Id { get; private set; } public string FIO { get; private set; } + public string Email { get; private set; } + public string PostId { get; private set; } public DateTime BirthDate { get; private set; } @@ -17,10 +20,11 @@ public class WorkerDataModelcs : IValidation public bool IsDeleted { get; private set; } - public WorkerDataModelcs(string id, string fio, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) + public WorkerDataModel(string id, string email, string fio, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) { Id = id; FIO = fio; + Email = email; PostId = postId; BirthDate = birthDate; EmploymentDate = employmentDate; @@ -52,5 +56,8 @@ public class WorkerDataModelcs : IValidation if ((EmploymentDate - BirthDate).TotalDays / 365 < 16) // EmploymentDate.Year - BirthDate.Year throw new ValidationException($"Minors cannot be hired (EmploymentDate - { EmploymentDate.ToShortDateString() }, BirthDate - { BirthDate.ToShortDateString()})"); + + if (!Regex.IsMatch(Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$")) // example@example.com + throw new ValidationException("Field Email is not a email"); } } \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/Enums/PostType.cs b/North_Bridge/North_Bridge_Contract/Enums/PostType.cs index 2ad48fd..b2fe0fe 100644 --- a/North_Bridge/North_Bridge_Contract/Enums/PostType.cs +++ b/North_Bridge/North_Bridge_Contract/Enums/PostType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace North_Bridge_Contract.Enums; public enum PostType @@ -13,4 +8,4 @@ public enum PostType Cashier = 2, Loader = 3, Consultant = 4 -} +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/Enums/ProductType.cs b/North_Bridge/North_Bridge_Contract/Enums/ProductType.cs index 247bf66..cf8f968 100644 --- a/North_Bridge/North_Bridge_Contract/Enums/ProductType.cs +++ b/North_Bridge/North_Bridge_Contract/Enums/ProductType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace North_Bridge_Contract.Enums; [Flags] @@ -14,4 +9,4 @@ public enum ProductType Monitor = 2, ComputerMouse = 4, AudioSystem = 8 -} +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/Exceptions/ValidationException.cs b/North_Bridge/North_Bridge_Contract/Exceptions/ValidationException.cs index f5670c6..f82b379 100644 --- a/North_Bridge/North_Bridge_Contract/Exceptions/ValidationException.cs +++ b/North_Bridge/North_Bridge_Contract/Exceptions/ValidationException.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace North_Bridge_Contract.Exceptions; public class ValidationException : Exception @@ -12,4 +7,4 @@ public class ValidationException : Exception { } -} +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Contract/Extentions/StringExtentions.cs b/North_Bridge/North_Bridge_Contract/Extentions/StringExtentions.cs index 5f26a74..cdde963 100644 --- a/North_Bridge/North_Bridge_Contract/Extentions/StringExtentions.cs +++ b/North_Bridge/North_Bridge_Contract/Extentions/StringExtentions.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace North_Bridge_Contract.Extentions; public static class StringExtentions diff --git a/North_Bridge/North_Bridge_Contract/Infrastructure/IValidation.cs b/North_Bridge/North_Bridge_Contract/Infrastructure/IValidation.cs index 293ba43..e56ff89 100644 --- a/North_Bridge/North_Bridge_Contract/Infrastructure/IValidation.cs +++ b/North_Bridge/North_Bridge_Contract/Infrastructure/IValidation.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace North_Bridge_Contract.Infrastructure; public interface IValidation { void Validate(); -} +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/DataModelsTests/PostDataModelTests.cs b/North_Bridge/North_Bridge_Tests/DataModelsTests/PostDataModelTests.cs new file mode 100644 index 0000000..6b2a656 --- /dev/null +++ b/North_Bridge/North_Bridge_Tests/DataModelsTests/PostDataModelTests.cs @@ -0,0 +1,106 @@ +using North_Bridge_Contract.DataModels; +using North_Bridge_Contract.Enums; +using North_Bridge_Contract.Exceptions; +namespace North_Bridge_Tests.DataModelsTests; + +[TestFixture] +internal class PostDataModelTests +{ + [Test] + public void IdIsNullOrEmptyTest() + { + var post = CreateDataModel(null, Guid.NewGuid().ToString(), "name", PostType.Consultant, 10000, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + post = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), "name", PostType.Loader, 10500, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + } + + [Test] + public void IdIsNotGuidTest() + { + var post = CreateDataModel("id", Guid.NewGuid().ToString(), "name", PostType.Cashier, 10, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + } + + [Test] + public void PostIdIsNullEmptyTest() + { + var post = CreateDataModel(Guid.NewGuid().ToString(), null, "name", PostType.Cashier, 10, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + post = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "name", PostType.Cashier, 10, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + } + + [Test] + public void PostIdIsNotGuidTest() + { + var post = CreateDataModel(Guid.NewGuid().ToString(), "postId", "name", PostType.Cashier, 10, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + } + + [Test] + public void PostNameIsEmptyTest() + { + var manufacturer = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, PostType.Cashier, 10, true, DateTime.UtcNow); + Assert.That(() => manufacturer.Validate(), + Throws.TypeOf()); + manufacturer = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), string.Empty, PostType.Cashier, 10, true, DateTime.UtcNow); + Assert.That(() => manufacturer.Validate(), + Throws.TypeOf()); + } + + [Test] + public void PostTypeIsNoneTest() + { + var post = CreateDataModel(Guid.NewGuid().ToString(), + Guid.NewGuid().ToString(), "name", PostType.None, 10, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + } + + [Test] + public void SalaryIsLessOrZeroTest() + { + var post = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "name", PostType.Cashier, 0, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + post = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "name", PostType.Cashier, -10, true, DateTime.UtcNow); + Assert.That(() => post.Validate(), + Throws.TypeOf()); + } + + [Test] + public void AllFieldsIsCorrectTest() + { + var postId = Guid.NewGuid().ToString(); + var postPostId = Guid.NewGuid().ToString(); + var postName = "name"; + var postType = PostType.Cashier; + var salary = 10; + var isActual = false; + var changeDate = DateTime.UtcNow.AddDays(-1); + var post = CreateDataModel(postId, postPostId, postName, postType, + salary, isActual, changeDate); + Assert.That(() => post.Validate(), Throws.Nothing); + Assert.Multiple(() => + { + Assert.That(post.Id, Is.EqualTo(postId)); + Assert.That(post.PostId, Is.EqualTo(postPostId)); + Assert.That(post.PostName, Is.EqualTo(postName)); + Assert.That(post.PostType, Is.EqualTo(postType)); + Assert.That(post.Salary, Is.EqualTo(salary)); + Assert.That(post.IsActual, Is.EqualTo(isActual)); + Assert.That(post.ChangeDate, Is.EqualTo(changeDate)); + }); + } + + private static PostDataModel CreateDataModel(string? id, string? postId, + string? postName, PostType postType, double salary, bool isActual, DateTime changeDate) => + new (id, postId, postName, postType, salary, isActual, changeDate); +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductDataModelTests.cs b/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductDataModelTests.cs new file mode 100644 index 0000000..200c6f4 --- /dev/null +++ b/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductDataModelTests.cs @@ -0,0 +1,87 @@ +using North_Bridge_Contract.DataModels; +using North_Bridge_Contract.Enums; +using North_Bridge_Contract.Exceptions; + +namespace North_Bridge_Tests.DataModelsTests; + +[TestFixture] +internal class ProductDataModelTests +{ + [Test] + public void IdIsNullOrEmptyTest() + { + var product = CreateDataModel(null, "name", ProductType.Monitor, 10, false); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + product = CreateDataModel(string.Empty, "name", + ProductType.Monitor, 10, false); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + } + + [Test] + public void IdIsNotGuidTest() + { + var product = CreateDataModel("id", "name", ProductType.Monitor, 10, false); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + } + + [Test] + public void ProductNameIsEmptyTest() + { + var product = CreateDataModel(Guid.NewGuid().ToString(), null, + ProductType.Monitor, 10, false); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + product = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, + ProductType.Monitor, 10, false); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + } + + [Test] + public void ProductTypeIsNoneTest() + { + var product = CreateDataModel(Guid.NewGuid().ToString(), null, + ProductType.None, 10, false); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + } + + [Test] + public void PriceIsLessOrZeroTest() + { + var product = CreateDataModel(Guid.NewGuid().ToString(), "name", + ProductType.Monitor, 0, false); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + product = CreateDataModel(Guid.NewGuid().ToString(), "name", ProductType.Monitor, -10, false); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + } + + [Test] + public void AllFieldsIsCorrectTest() + { + var productId = Guid.NewGuid().ToString(); + var productName = "name"; + var productType = ProductType.Monitor; + var productPrice = 10; + var productIsDelete = false; + var product = CreateDataModel(productId, productName, productType, productPrice, productIsDelete); + Assert.That(() => product.Validate(), Throws.Nothing); + Assert.Multiple(() => + { + Assert.That(product.Id, Is.EqualTo(productId)); + Assert.That(product.ProductName, Is.EqualTo(productName)); + Assert.That(product.ProductType, Is.EqualTo(productType)); + Assert.That(product.Price, Is.EqualTo(productPrice)); + Assert.That(product.IsDeleted, Is.EqualTo(productIsDelete)); + }); + } + + private static ProductDataModel CreateDataModel(string? id, string? + productName, ProductType productType, double price, bool + isDeleted) => new (id, productName, productType, price, isDeleted); +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductForSaleDataModelTests.cs b/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductForSaleDataModelTests.cs new file mode 100644 index 0000000..d46be5a --- /dev/null +++ b/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductForSaleDataModelTests.cs @@ -0,0 +1,76 @@ +using North_Bridge_Contract.DataModels; +using North_Bridge_Contract.Exceptions; + +namespace North_Bridge_Tests.DataModelsTests; + +[TestFixture] +internal class ProductForSaleDataModelTests +{ + [Test] + public void SaleIdIsNullOrEmptyTest() + { + var saleProduct = CreateDataModel(null, Guid.NewGuid().ToString(), 10); + Assert.That(() => saleProduct.Validate(), + Throws.TypeOf()); + saleProduct = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), 10); + Assert.That(() => saleProduct.Validate(), + Throws.TypeOf()); + } + + [Test] + public void SaleIdIsNotGuidTest() + { + var saleProduct = CreateDataModel("saleId", Guid.NewGuid().ToString(), 10); + Assert.That(() => saleProduct.Validate(), + Throws.TypeOf()); + } + + [Test] + public void ProductIdIsNullOrEmptyTest() + { + var saleProduct = CreateDataModel(Guid.NewGuid().ToString(), null, 10); + Assert.That(() => saleProduct.Validate(), + Throws.TypeOf()); + saleProduct = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), 10); + Assert.That(() => saleProduct.Validate(), + Throws.TypeOf()); + } + + [Test] + public void ProductIdIsNotGuidTest() + { + var saleProduct = CreateDataModel(Guid.NewGuid().ToString(), "productId", 10); + Assert.That(() => saleProduct.Validate(), + Throws.TypeOf()); + } + + [Test] + public void CountIsLessOrZeroTest() + { + var saleProduct = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 0); + Assert.That(() => saleProduct.Validate(), + Throws.TypeOf()); + saleProduct = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), -10); + Assert.That(() => saleProduct.Validate(), + Throws.TypeOf()); + } + + [Test] + public void AllFieldsIsCorrectTest() + { + var saleId = Guid.NewGuid().ToString(); + var productId = Guid.NewGuid().ToString(); + var count = 10; + var saleProduct = CreateDataModel(saleId, productId, count); + Assert.That(() => saleProduct.Validate(), Throws.Nothing); + Assert.Multiple(() => + { + Assert.That(saleProduct.SaleId, Is.EqualTo(saleId)); + Assert.That(saleProduct.ProductId, Is.EqualTo(productId)); + Assert.That(saleProduct.Count, Is.EqualTo(count)); + }); + } + + private static ProductForSaleDataModel CreateDataModel(string? saleId, string? + productId, int count) => new(saleId, productId, count); +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductHistoryDataModelTests.cs b/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductHistoryDataModelTests.cs new file mode 100644 index 0000000..60dd0e8 --- /dev/null +++ b/North_Bridge/North_Bridge_Tests/DataModelsTests/ProductHistoryDataModelTests.cs @@ -0,0 +1,58 @@ +using North_Bridge_Contract.DataModels; +using North_Bridge_Contract.Exceptions; + +namespace North_Bridge_Tests.DataModelsTests; + +[TestFixture] +internal class ProductHistoryDataModelTests +{ + [Test] + public void ProductIdIsNullOrEmptyTest() + { + var product = CreateDataModel(null, 10); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + product = CreateDataModel(string.Empty, 10); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + } + + [Test] + public void ProductIdIsNotGuidTest() + { + var product = CreateDataModel("id", 10); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + } + + [Test] + public void OldPriceIsLessOrZeroTest() + { + var product = CreateDataModel(Guid.NewGuid().ToString(), 0); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + product = CreateDataModel(Guid.NewGuid().ToString(), -10); + Assert.That(() => product.Validate(), + Throws.TypeOf()); + } + + [Test] + public void AllFieldsIsCorrectTest() + { + var productId = Guid.NewGuid().ToString(); + var oldPrice = 10; + var productHistory = CreateDataModel(productId, oldPrice); + Assert.That(() => productHistory.Validate(), Throws.Nothing); + Assert.Multiple(() => + { + Assert.That(productHistory.ProductId, Is.EqualTo(productId)); + Assert.That(productHistory.OldPrice, Is.EqualTo(oldPrice)); + Assert.That(productHistory.ChangeDate, + Is.LessThan(DateTime.UtcNow)); + Assert.That(productHistory.ChangeDate, + Is.GreaterThan(DateTime.UtcNow.AddMinutes(-1))); + }); + } + + private static ProductHistoryDataModel CreateDataModel(string? productId, double oldPrice) => new(productId, oldPrice); +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/DataModelsTests/SalaryDataModelTests.cs b/North_Bridge/North_Bridge_Tests/DataModelsTests/SalaryDataModelTests.cs new file mode 100644 index 0000000..cdc544c --- /dev/null +++ b/North_Bridge/North_Bridge_Tests/DataModelsTests/SalaryDataModelTests.cs @@ -0,0 +1,57 @@ +using North_Bridge_Contract.DataModels; +using North_Bridge_Contract.Exceptions; + +namespace North_Bridge_Tests.DataModelsTests; + +[TestFixture] +internal class SalaryDataModelTests +{ + [Test] + public void WorkerIdIsEmptyTest() + { + var salary = CreateDataModel(null, DateTime.Now, 10); + Assert.That(() => salary.Validate(), + Throws.TypeOf()); + salary = CreateDataModel(string.Empty, DateTime.Now, 10); + Assert.That(() => salary.Validate(), + Throws.TypeOf()); + } + + [Test] + public void WorkerIdIsNotGuidTest() + { + var salary = CreateDataModel("workerId", DateTime.Now, 10); + Assert.That(() => salary.Validate(), + Throws.TypeOf()); + } + + [Test] + public void PriceIsLessOrZeroTest() + { + var salary = CreateDataModel(Guid.NewGuid().ToString(), DateTime.Now, 0); + Assert.That(() => salary.Validate(), + Throws.TypeOf()); + salary = CreateDataModel(Guid.NewGuid().ToString(), DateTime.Now, -10); + Assert.That(() => salary.Validate(), + Throws.TypeOf()); + } + + [Test] + public void AllFieldsIsCorrectTest() + { + var workerId = Guid.NewGuid().ToString(); + var salaryDate = DateTime.Now.AddDays(-3).AddMinutes(-5); + var workerSalary = 10; + var salary = CreateDataModel(workerId, salaryDate, workerSalary); + Assert.That(() => salary.Validate(), Throws.Nothing); + Assert.Multiple(() => + { + Assert.That(salary.WorkerId, Is.EqualTo(workerId)); + Assert.That(salary.SalaryDate, Is.EqualTo(salaryDate)); + Assert.That(salary.Salary, Is.EqualTo(workerSalary)); + }); + } + + private static SalaryDataModel CreateDataModel(string? workerId, DateTime salaryDate, double workerSalary) + => new(workerId, salaryDate, workerSalary); +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/DataModelsTests/SaleDataModelTestscs.cs b/North_Bridge/North_Bridge_Tests/DataModelsTests/SaleDataModelTestscs.cs new file mode 100644 index 0000000..1455659 --- /dev/null +++ b/North_Bridge/North_Bridge_Tests/DataModelsTests/SaleDataModelTestscs.cs @@ -0,0 +1,92 @@ +using North_Bridge_Contract.DataModels; +using North_Bridge_Contract.Exceptions; + +namespace North_Bridge_Tests.DataModelsTests; + +[TestFixture] +internal class SaleDataModelTestscs +{ + [Test] + public void IdIsNullOrEmptyTest() + { + var sale = CreateDataModel(null, Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => sale.Validate(), + Throws.TypeOf()); + sale = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => sale.Validate(), + Throws.TypeOf()); + } + + [Test] + public void IdIsNotGuidTest() + { + var sale = CreateDataModel("id", Guid.NewGuid().ToString(), 10, false, CreateSubDataModel()); + Assert.That(() => sale.Validate(), Throws.TypeOf()); + } + + [Test] + public void WorkerIdIsNullOrEmptyTest() + { + var sale = CreateDataModel(Guid.NewGuid().ToString(), null, 10, false, CreateSubDataModel()); + Assert.That(() => sale.Validate(), + Throws.TypeOf()); + sale = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, 10, false, CreateSubDataModel()); + Assert.That(() => sale.Validate(), + Throws.TypeOf()); + } + + [Test] + public void WorkerIdIsNotGuidTest() + { + var sale = CreateDataModel(Guid.NewGuid().ToString(), "workerId", 10, false, CreateSubDataModel()); + Assert.That(() => sale.Validate(), + Throws.TypeOf()); + } + + [Test] + public void SumIsLessOrZeroTest() + { + var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 0, false, CreateSubDataModel()); + Assert.That(() => sale.Validate(), + Throws.TypeOf()); + sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), -10, false, CreateSubDataModel()); + Assert.That(() => sale.Validate(), + Throws.TypeOf()); + } + + [Test] + public void ProductsIsNullOrEmptyTest() + { + var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, false, null); + Assert.That(() => sale.Validate(), + Throws.TypeOf()); + sale = CreateDataModel(Guid.NewGuid().ToString(),Guid.NewGuid().ToString(), 10, false, []); + Assert.That(() => sale.Validate(), Throws.TypeOf()); + } + + [Test] + public void AllFieldsIsCorrectTest() + { + var saleId = Guid.NewGuid().ToString(); + var workerId = Guid.NewGuid().ToString(); + var sum = 10; + var isCancel = true; + var products = CreateSubDataModel(); + var sale = CreateDataModel(saleId, workerId, sum, isCancel, products); + Assert.That(() => sale.Validate(), Throws.Nothing); + Assert.Multiple(() => + { + Assert.That(sale.Id, Is.EqualTo(saleId)); + Assert.That(sale.WorkerId, Is.EqualTo(workerId)); + Assert.That(sale.Sum, Is.EqualTo(sum)); + Assert.That(sale.IsCancel, Is.EqualTo(isCancel)); + Assert.That(sale.Products, Is.EquivalentTo(products)); + }); + } + + private static SaleDataModel CreateDataModel(string? id, string? workerId, double sum, bool isCancel, List? products) => + new(id, workerId, sum, isCancel, products); + + private static List CreateSubDataModel() + => [new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 1)]; +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/DataModelsTests/WorkerDataModelTests.cs b/North_Bridge/North_Bridge_Tests/DataModelsTests/WorkerDataModelTests.cs new file mode 100644 index 0000000..751a89c --- /dev/null +++ b/North_Bridge/North_Bridge_Tests/DataModelsTests/WorkerDataModelTests.cs @@ -0,0 +1,124 @@ +using North_Bridge_Contract.DataModels; +using North_Bridge_Contract.Exceptions; + +namespace North_Bridge_Tests.DataModelsTests; + +[TestFixture] +internal class WorkerDataModelTests +{ + [Test] + public void IdIsNullOrEmptyTest() + { + var worker = CreateDataModel(null, "fio", "example@example.com", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-18), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + worker = CreateDataModel(string.Empty, "fio", "example@example.com", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-18), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + } + + [Test] + public void IdIsNotGuidTest() + { + var worker = CreateDataModel("id", "fio", "example@example.com", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-18), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + } + + [Test] + public void FIOIsNullOrEmptyTest() + { + var worker = CreateDataModel(Guid.NewGuid().ToString(), null, "example@example.com", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-18), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + worker = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "example@example.com", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-18), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + } + + [Test] + public void PostIdIsNullOrEmptyTest() + { + var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "example@example.com", null, DateTime.Now.AddYears(-18), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "example@example.com", string.Empty, DateTime.Now.AddYears(-18), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + } + + [Test] + public void PostIdIsNotGuidTest() + { + var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "example@example.com", "postId", DateTime.Now.AddYears(-18), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + + } + + [Test] + public void BirthDateIsNotCorrectTest() + { + var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "example@example.com", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16).AddDays(1), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + } + + [Test] + public void BirthDateAndEmploymentDateIsNotCorrectTest() + { + var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "example@example.com", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-18), DateTime.Now.AddYears(-18).AddDays(-1), false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "example@example.com", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-18), DateTime.Now.AddYears(-16), false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + } + + [Test] + public void EmailIsNullOrEmptyTest() + { + var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", null, Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16).AddDays(-1), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", string.Empty, Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16).AddDays(-1), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + } + + [Test] + public void EmailIsIncorrectTest() + { + var worker = CreateDataModel(Guid.NewGuid().ToString(), "fio", "example", Guid.NewGuid().ToString(), DateTime.Now.AddYears(-16).AddDays(-1), DateTime.Now, false); + Assert.That(() => worker.Validate(), + Throws.TypeOf()); + } + + [Test] + public void AllFieldsIsCorrectTest() + { + var workerId = Guid.NewGuid().ToString(); + var fio = "fio"; + var email = "example@example.com"; + var postId = Guid.NewGuid().ToString(); + var birthDate = DateTime.Now.AddYears(-16).AddDays(-1); + var employmentDate = DateTime.Now; + var isDelete = false; + var worker = CreateDataModel(workerId, fio, email, postId, birthDate, employmentDate, isDelete); + Assert.That(() => worker.Validate(), Throws.Nothing); + Assert.Multiple(() => + { + Assert.That(worker.Id, Is.EqualTo(workerId)); + Assert.That(worker.FIO, Is.EqualTo(fio)); + Assert.That(worker.Email, Is.EqualTo(email)); + Assert.That(worker.PostId, Is.EqualTo(postId)); + Assert.That(worker.BirthDate, Is.EqualTo(birthDate)); + Assert.That(worker.EmploymentDate,Is.EqualTo(employmentDate)); + Assert.That(worker.IsDeleted, Is.EqualTo(isDelete)); + }); + } + + private static WorkerDataModel CreateDataModel(string? id, string? fio, string email, + string? postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) => + new(id, fio, email, postId, birthDate, employmentDate, isDeleted); +} \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/North_Bridge_Tests.csproj b/North_Bridge/North_Bridge_Tests/North_Bridge_Tests.csproj new file mode 100644 index 0000000..6168504 --- /dev/null +++ b/North_Bridge/North_Bridge_Tests/North_Bridge_Tests.csproj @@ -0,0 +1,28 @@ + + + + net8.0 + enable + enable + + false + true + + + + + + + + + + + + + + + + + + + -- 2.25.1 From a06c65e3aaf257c71231266cbc2b08a3989589d7 Mon Sep 17 00:00:00 2001 From: 145Game Date: Mon, 17 Feb 2025 12:02:40 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=B2=20?= =?UTF-8?q?=D0=B7=D0=B5=D0=BB=D1=91=D0=BD=D0=BE=D0=B9=20=D0=B7=D0=BE=D0=BD?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataModels/WorkerDataModel.cs | 19 +++++++++++-------- .../DataModelsTests/WorkerDataModelTests.cs | 12 ++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModel.cs index b09cd89..cf18981 100644 --- a/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModel.cs +++ b/North_Bridge/North_Bridge_Contract/DataModels/WorkerDataModel.cs @@ -20,7 +20,7 @@ public class WorkerDataModel : IValidation public bool IsDeleted { get; private set; } - public WorkerDataModel(string id, string email, string fio, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) + public WorkerDataModel(string id, string fio, string email, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) { Id = id; FIO = fio; @@ -42,22 +42,25 @@ public class WorkerDataModel : IValidation if (FIO.IsEmpty()) throw new ValidationException("Field FIO is empty"); + 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"); + if (PostId.IsEmpty()) throw new ValidationException("Field PostId is empty"); if (!PostId.IsGuid()) throw new ValidationException("The value in the field PostId is not a unique identifier"); - if (BirthDate.Date > DateTime.Now.AddYears(-16).Date) - throw new ValidationException($"Minors cannot be hired (BirthDate = { BirthDate.ToShortDateString() })"); + if (BirthDate.Date > DateTime.Now.AddYears(-18).Date) + throw new ValidationException($"Only adults can be hired (BirthDate = {BirthDate.ToShortDateString()})"); if (EmploymentDate.Date < BirthDate.Date) throw new ValidationException("The date of employment cannot be less than the date of birth"); - if ((EmploymentDate - BirthDate).TotalDays / 365 < 16) // EmploymentDate.Year - BirthDate.Year - throw new ValidationException($"Minors cannot be hired (EmploymentDate - { EmploymentDate.ToShortDateString() }, BirthDate - { BirthDate.ToShortDateString()})"); - - if (!Regex.IsMatch(Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$")) // example@example.com - throw new ValidationException("Field Email is not a email"); + if ((EmploymentDate - BirthDate).TotalDays / 365 < 18) + throw new ValidationException($"Only adults can be hired (EmploymentDate - {EmploymentDate.ToShortDateString()}, BirthDate - {BirthDate.ToShortDateString()})"); } } \ No newline at end of file diff --git a/North_Bridge/North_Bridge_Tests/DataModelsTests/WorkerDataModelTests.cs b/North_Bridge/North_Bridge_Tests/DataModelsTests/WorkerDataModelTests.cs index 751a89c..0baf001 100644 --- a/North_Bridge/North_Bridge_Tests/DataModelsTests/WorkerDataModelTests.cs +++ b/North_Bridge/North_Bridge_Tests/DataModelsTests/WorkerDataModelTests.cs @@ -99,26 +99,26 @@ internal class WorkerDataModelTests { var workerId = Guid.NewGuid().ToString(); var fio = "fio"; - var email = "example@example.com"; + var Email = "example@example.com"; var postId = Guid.NewGuid().ToString(); - var birthDate = DateTime.Now.AddYears(-16).AddDays(-1); + var birthDate = DateTime.Now.AddYears(-18).AddDays(-1); var employmentDate = DateTime.Now; var isDelete = false; - var worker = CreateDataModel(workerId, fio, email, postId, birthDate, employmentDate, isDelete); + var worker = CreateDataModel(workerId, fio, Email, postId, birthDate, employmentDate, isDelete); Assert.That(() => worker.Validate(), Throws.Nothing); Assert.Multiple(() => { Assert.That(worker.Id, Is.EqualTo(workerId)); Assert.That(worker.FIO, Is.EqualTo(fio)); - Assert.That(worker.Email, Is.EqualTo(email)); + Assert.That(worker.Email, Is.EqualTo(Email)); Assert.That(worker.PostId, Is.EqualTo(postId)); Assert.That(worker.BirthDate, Is.EqualTo(birthDate)); - Assert.That(worker.EmploymentDate,Is.EqualTo(employmentDate)); + Assert.That(worker.EmploymentDate, Is.EqualTo(employmentDate)); Assert.That(worker.IsDeleted, Is.EqualTo(isDelete)); }); } - private static WorkerDataModel CreateDataModel(string? id, string? fio, string email, + private static WorkerDataModel CreateDataModel(string? id, string? fio, string? email, string? postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) => new(id, fio, email, postId, birthDate, employmentDate, isDeleted); } \ No newline at end of file -- 2.25.1 From bb7124e1b98a896484dc63ad7902ef0d5aaed58e Mon Sep 17 00:00:00 2001 From: 145Game Date: Mon, 17 Feb 2025 15:38:54 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=BE=D0=BC=20SaleDataModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataModels/SaleDataModel.cs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs b/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs index 544d8b0..1fd0b0d 100644 --- a/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs +++ b/North_Bridge/North_Bridge_Contract/DataModels/SaleDataModel.cs @@ -18,17 +18,7 @@ public class SaleDataModel : IValidation public List Products { get; private set; } - public SaleDataModel(string id, string workerId, DateTime saleDate, double sum, bool isCancel, List products) - { - Id = id; - WorkerId = workerId; - SaleDate = saleDate; - Sum = sum; - IsCancel = isCancel; - Products = products; - } - - public SaleDataModel(string? id, string? workerId, double sum, bool isCancel, List? products) + public SaleDataModel(string id, string workerId, double sum, bool isCancel, List products) { Id = id; WorkerId = workerId; -- 2.25.1