From ac4aa4a14606eddf5c5a08478eccae2a92594cd7 Mon Sep 17 00:00:00 2001 From: xom9k Date: Tue, 8 Apr 2025 14:27:46 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MagicCarpetContracts/DataModels/TourDataModel.cs | 4 ++-- .../Implementations/AgencyStorageContract.cs | 2 +- .../Implementations/TourStorageContract.cs | 4 +++- MagicCarpetProject/MagicCarpetDatabase/Models/Tour.cs | 2 +- .../TourBusinessLogicContractTests.cs | 4 ++-- .../MagicCarpetTests/DataModelTests/TourDataModelTests.cs | 2 +- .../StoragesContractsTests/AgencyStorageContractTests.cs | 2 +- .../StoragesContractsTests/SaleStorageContractTests.cs | 2 +- .../StoragesContractsTests/SuppliesStorageContractTests.cs | 2 +- .../StoragesContractsTests/TourStorageContractTests.cs | 6 +++--- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/MagicCarpetProject/MagicCarpetContracts/DataModels/TourDataModel.cs b/MagicCarpetProject/MagicCarpetContracts/DataModels/TourDataModel.cs index 35ccfb7..04a7b05 100644 --- a/MagicCarpetProject/MagicCarpetContracts/DataModels/TourDataModel.cs +++ b/MagicCarpetProject/MagicCarpetContracts/DataModels/TourDataModel.cs @@ -18,7 +18,7 @@ public class TourDataModel(string id, string tourName, string tourCountry, doubl public string TourName { get; private set; } = tourName; public string TourCountry { get; private set; } = tourCountry; public double Price { get; private set; } = price; - public TourType Type { get; private set; } = tourType; + public TourType TourType { get; private set; } = tourType; public void Validate() { @@ -32,7 +32,7 @@ public class TourDataModel(string id, string tourName, string tourCountry, doubl throw new ValidationException("Field TourCountry is empty"); if (Price <= 0) throw new ValidationException("Field Price is less than or equal to 0"); - if (Type == TourType.None) + if (TourType == TourType.None) throw new ValidationException("Field Type is empty"); } } diff --git a/MagicCarpetProject/MagicCarpetDatabase/Implementations/AgencyStorageContract.cs b/MagicCarpetProject/MagicCarpetDatabase/Implementations/AgencyStorageContract.cs index 7ac8ad2..9690b19 100644 --- a/MagicCarpetProject/MagicCarpetDatabase/Implementations/AgencyStorageContract.cs +++ b/MagicCarpetProject/MagicCarpetDatabase/Implementations/AgencyStorageContract.cs @@ -122,7 +122,7 @@ public class AgencyStorageContract : IAgencyStorageContract foreach (SaleTourDataModel sale_tour in saleDataModel.Tours) { var tour = _dbContext.Tours.FirstOrDefault(x => x.Id == sale_tour.TourId); - var agency = _dbContext.Agencies.FirstOrDefault(x => x.Type == tour.Type && x.Count >= sale_tour.Count); + var agency = _dbContext.Agencies.FirstOrDefault(x => x.Type == tour.TourType && x.Count >= sale_tour.Count); if (agency == null) { diff --git a/MagicCarpetProject/MagicCarpetDatabase/Implementations/TourStorageContract.cs b/MagicCarpetProject/MagicCarpetDatabase/Implementations/TourStorageContract.cs index a15c183..c671c95 100644 --- a/MagicCarpetProject/MagicCarpetDatabase/Implementations/TourStorageContract.cs +++ b/MagicCarpetProject/MagicCarpetDatabase/Implementations/TourStorageContract.cs @@ -24,7 +24,9 @@ internal class TourStorageContract : ITourStorageContract _dbContext = dbContext; var config = new MapperConfiguration(cfg => { - cfg.AddMaps(typeof(Tour)); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); ; }); _mapper = new Mapper(config); } diff --git a/MagicCarpetProject/MagicCarpetDatabase/Models/Tour.cs b/MagicCarpetProject/MagicCarpetDatabase/Models/Tour.cs index 32492c5..15c5aba 100644 --- a/MagicCarpetProject/MagicCarpetDatabase/Models/Tour.cs +++ b/MagicCarpetProject/MagicCarpetDatabase/Models/Tour.cs @@ -18,7 +18,7 @@ public class Tour public required string TourName { get; set; } public string? TourCountry { get; set; } public double Price { get; set; } - public required TourType Type { get; set; } + public required TourType TourType { get; set; } [ForeignKey("TourId")] public List? SaleTours { get; set; } [ForeignKey("TourId")] diff --git a/MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/TourBusinessLogicContractTests.cs b/MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/TourBusinessLogicContractTests.cs index fc373d8..8d4165c 100644 --- a/MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/TourBusinessLogicContractTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/TourBusinessLogicContractTests.cs @@ -250,7 +250,7 @@ internal class TourBusinessLogicContractTests .Callback((TourDataModel x) => { flag = x.Id == record.Id && x.TourName == record.TourName && x.TourCountry == record.TourCountry - && x.Price == record.Price && x.Type == record.Type; + && x.Price == record.Price && x.TourType == record.TourType; }); //Act _tourBusinessLogicContract.InsertTour(record); @@ -313,7 +313,7 @@ internal class TourBusinessLogicContractTests .Callback((TourDataModel x) => { flag = x.Id == record.Id && x.TourName == record.TourName && x.TourCountry == record.TourCountry - && x.Price == record.Price && x.Type == record.Type; + && x.Price == record.Price && x.TourType == record.TourType; }); //Act _tourBusinessLogicContract.UpdateTour(record); diff --git a/MagicCarpetProject/MagicCarpetTests/DataModelTests/TourDataModelTests.cs b/MagicCarpetProject/MagicCarpetTests/DataModelTests/TourDataModelTests.cs index 8971464..a3ef3e5 100644 --- a/MagicCarpetProject/MagicCarpetTests/DataModelTests/TourDataModelTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/DataModelTests/TourDataModelTests.cs @@ -78,7 +78,7 @@ internal class TourDataModelTests Assert.That(tour.TourName, Is.EqualTo(tourName)); Assert.That(tour.TourCountry, Is.EqualTo(tourCountry)); Assert.That(tour.Price, Is.EqualTo(price)); - Assert.That(tour.Type, Is.EqualTo(tourType)); + Assert.That(tour.TourType, Is.EqualTo(tourType)); }); } diff --git a/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/AgencyStorageContractTests.cs b/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/AgencyStorageContractTests.cs index 4a1002b..5111477 100644 --- a/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/AgencyStorageContractTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/AgencyStorageContractTests.cs @@ -125,7 +125,7 @@ internal class AgencyStorageContractTests : BaseStorageContractTest private Tour InsertTourToDatabaseAndReturn(string id, string name, TourType type) { - var tour = new Tour { Id = id, TourName = name, Type = type }; + var tour = new Tour { Id = id, TourName = name, TourType = type }; MagicCarpetDbContext.Tours.Add(tour); MagicCarpetDbContext.SaveChanges(); return tour; diff --git a/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SaleStorageContractTests.cs b/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SaleStorageContractTests.cs index f3dd75b..4e08633 100644 --- a/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SaleStorageContractTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SaleStorageContractTests.cs @@ -211,7 +211,7 @@ internal class SaleStorageContractTests : BaseStorageContractTest private Tour InsertTourToDatabaseAndReturn(string tourName = "test", TourType tourType = TourType.Sightseeing, double price = 1) { - var tour = new Tour() { Id = Guid.NewGuid().ToString(), TourName = tourName, Type = tourType, Price = price }; + var tour = new Tour() { Id = Guid.NewGuid().ToString(), TourName = tourName, TourType = tourType, Price = price }; MagicCarpetDbContext.Tours.Add(tour); MagicCarpetDbContext.SaveChanges(); return tour; diff --git a/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SuppliesStorageContractTests.cs b/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SuppliesStorageContractTests.cs index db458ba..7ffec7a 100644 --- a/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SuppliesStorageContractTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SuppliesStorageContractTests.cs @@ -98,7 +98,7 @@ internal class SuppliesStorageContractTests : BaseStorageContractTest private Tour InsertTourToDatabaseAndReturn() { - var tour = new Tour { Id = Guid.NewGuid().ToString(), TourName = "Test Tour", Type = TourType.Ski }; + var tour = new Tour { Id = Guid.NewGuid().ToString(), TourName = "Test Tour", TourType = TourType.Ski }; MagicCarpetDbContext.Tours.Add(tour); MagicCarpetDbContext.SaveChanges(); return tour; diff --git a/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/TourStorageContractTests.cs b/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/TourStorageContractTests.cs index c22fe8c..914bfa7 100644 --- a/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/TourStorageContractTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/TourStorageContractTests.cs @@ -168,7 +168,7 @@ internal class TourStorageContractTests : BaseStorageContractTest private Tour InsertTourToDatabaseAndReturn(string id, string tourName = "test", string tourCountry = "country", TourType tourType = TourType.Beach, double price = 1) { - var tour = new Tour() { Id = id, TourName = tourName, TourCountry = tourCountry, Type = tourType, Price = price }; + var tour = new Tour() { Id = id, TourName = tourName, TourCountry = tourCountry, TourType = tourType, Price = price }; MagicCarpetDbContext.Tours.Add(tour); MagicCarpetDbContext.SaveChanges(); return tour; @@ -190,7 +190,7 @@ internal class TourStorageContractTests : BaseStorageContractTest Assert.That(actual.Id, Is.EqualTo(expected.Id)); Assert.That(actual.TourName, Is.EqualTo(expected.TourName)); Assert.That(actual.TourCountry, Is.EqualTo(expected.TourCountry)); - Assert.That(actual.Type, Is.EqualTo(expected.Type)); + Assert.That(actual.TourType, Is.EqualTo(expected.TourType)); Assert.That(actual.Price, Is.EqualTo(expected.Price)); }); } @@ -208,7 +208,7 @@ internal class TourStorageContractTests : BaseStorageContractTest Assert.That(actual.Id, Is.EqualTo(expected.Id)); Assert.That(actual.TourName, Is.EqualTo(expected.TourName)); Assert.That(actual.TourCountry, Is.EqualTo(expected.TourCountry)); - Assert.That(actual.Type, Is.EqualTo(expected.Type)); + Assert.That(actual.TourType, Is.EqualTo(expected.TourType)); Assert.That(actual.Price, Is.EqualTo(expected.Price)); }); }