Gerimovich_Ilya/PIbd-22_Gerimovich_I.M._Tyorkin_D.V._CourseWork_TravelAgency
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "молодой белый"

Browse Source 
This reverts commit 654f87f888.
This commit is contained in:
platoff aeeee 2024-04-30 21:55:47 +04:00
parent 7d946fe3fd
commit 32c00a42a6
19 changed files with 136 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TravelCompany/TravelCompanyContracts/SearchModels/Guarantor/PlaceSearchModel.cs
View File

@ -11,8 +11,8 @@ namespace TravelCompanyContracts.SearchModels.Guarantor
{
public int? Id { get; set; }
public string? NamePlace { get; set; } = string.Empty;
public string NamePlace { get; set; } = string.Empty;
public string? DescriptionPlace { get; set; } = string.Empty;
public string DescriptionPlace { get; set; } = string.Empty;
}
}

6
TravelCompany/TravelCompanyContracts/SearchModels/Guarantor/TripSearchModel.cs
View File

@ -6,11 +6,7 @@ using System.Threading.Tasks;
namespace TravelCompanyContracts.SearchModels.Guarantor
{
public class TripSearchModel
internal class TripSearchModel
{
public int? Id { get; set; }
public string? TripName { get; set; } = string.Empty;
public DateTime? TripDate { get; set; }
public int? GuarantorID { get; set; }
}
}

8
TravelCompany/TravelCompanyContracts/StoragesModels/Guarantor/IGuarantorStorage.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TravelCompanyContracts.BindingModels.Guarantor;
using TravelCompanyContracts.BindingModels;
using TravelCompanyContracts.SearchModels.Guarantor;
using TravelCompanyContracts.ViewModels.Guarantor.ViewModels;
@ -18,10 +18,10 @@ namespace TravelCompanyContracts.StoragesModels.Guarantor
GuarantorViewModel? GetElement(GuarantorSearchModel model);
GuarantorViewModel? Insert(GuarantorBindingModel model);
GuarantorViewModel? Insert(GuarantorSearchModel model);
GuarantorViewModel? Update(GuarantorBindingModel model);
GuarantorViewModel? Update(GuarantorSearchModel model);
GuarantorViewModel? Delete(GuarantorBindingModel model);
GuarantorViewModel? Delete(GuarantorSearchModel model);
}
}

7
TravelCompany/TravelCompanyContracts/StoragesModels/Guarantor/IGuideStorage.cs
View File

@ -4,7 +4,6 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TravelCompanyContracts.BindingModels;
using TravelCompanyContracts.BindingModels.Guarantor;
using TravelCompanyContracts.SearchModels.Guarantor;
using TravelCompanyContracts.ViewModels.Guarantor.ViewModels;
@ -19,10 +18,10 @@ namespace TravelCompanyContracts.StoragesModels.Guarantor
GuideViewModel? GetElement(GuideSearchModel model);
GuideViewModel? Insert(GuideBindingModel model);
GuideViewModel? Insert(GuideSearchModel model);
GuideViewModel? Update(GuideBindingModel model);
GuideViewModel? Update(GuideSearchModel model);
GuideViewModel? Delete(GuideBindingModel model);
GuideViewModel? Delete(GuideSearchModel model);
}
}

7
TravelCompany/TravelCompanyContracts/StoragesModels/Guarantor/IPlaceStorage.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TravelCompanyContracts.BindingModels.Guarantor;
using TravelCompanyContracts.SearchModels.Guarantor;
using TravelCompanyContracts.ViewModels.Guarantor.ViewModels;
@ -18,10 +17,10 @@ namespace TravelCompanyContracts.StoragesModels.Guarantor
PlaceViewModel? GetElement(PlaceSearchModel model);
PlaceViewModel? Insert(PlaceBindingModel model);
PlaceViewModel? Insert(PlaceSearchModel model);
PlaceViewModel? Update(PlaceBindingModel model);
PlaceViewModel? Update(PlaceSearchModel model);
PlaceViewModel? Delete(PlaceBindingModel model);
PlaceViewModel? Delete(PlaceSearchModel model);
}
}

16
TravelCompany/TravelCompanyContracts/StoragesModels/Guarantor/ITripStorage.cs
View File

@ -3,24 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TravelCompanyContracts.BindingModels.Guarantor;
using TravelCompanyContracts.SearchModels.Guarantor;
using TravelCompanyContracts.ViewModels.Guarantor.ViewModels;
namespace TravelCompanyContracts.StoragesModels.Guarantor
{
public interface ITripStorage
internal class ITripStorage
{
List<TripViewModel> GetFullList();
List<TripViewModel> GetFilteredList(TripSearchModel model);
TripViewModel? GetElement(TripSearchModel model);
TripViewModel? Insert(TripBindingModel model);
TripViewModel? Update(TripBindingModel model);
TripViewModel? Delete(TripBindingModel model);
}
}

100
TravelCompany/TravelCompanyDatabaseImplement/Implements/GuarantorImplements/GuarantorStorage.cs
View File

@ -3,108 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TravelCompanyContracts.BindingModels.Contractor;
using TravelCompanyContracts.BindingModels.Guarantor;
using TravelCompanyContracts.SearchModels.Contractor;
using TravelCompanyContracts.SearchModels.Guarantor;
using TravelCompanyContracts.StoragesModels.Guarantor;
using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyContracts.ViewModels.Guarantor.ViewModels;
using TravelCompanyDatabaseImplement.Models;
using TravelCompanyDatabaseImplement.Models.ContractorModels;
namespace TravelCompanyDatabaseImplement.Implements.GuarantorImplements
{
public class GuarantorStorage : IGuarantorStorage
internal class GuarantorStorage
{
public List<GuarantorViewModel> GetFullList()
{
using var context = new TravelCompanyDatabase();
return context.Guarantors
.Select(x => x.GetViewModel)
.ToList();
}
public List<GuarantorViewModel> GetFilteredList(GuarantorSearchModel model)
{
if (string.IsNullOrEmpty(model.Surname))
{
return new();
}
using var context = new TravelCompanyDatabase();
return context.Guarantors
.Where(x => x.Surname.Contains(model.Surname))
.Select(x => x.GetViewModel)
.ToList();
}
public GuarantorViewModel? GetElement(GuarantorSearchModel model)
{
using var context = new TravelCompanyDatabase();
if (model.Id.HasValue)
{
return context.Guarantors
.FirstOrDefault(x => x.Id.Equals(model.Id))
?.GetViewModel;
}
if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password))
{
return context.Guarantors
.FirstOrDefault(x => x.Email.Equals(model.Email) && x.Password.Equals(model.Password))
?.GetViewModel;
}
if (!string.IsNullOrEmpty(model.Email))
{
return context.Guarantors
.FirstOrDefault(x => x.Email.Equals(model.Email))
?.GetViewModel;
}
if (!string.IsNullOrEmpty(model.MobilePhone))
{
return context.Guarantors
.FirstOrDefault(x => x.MobilePhone.Equals(model.MobilePhone))
?.GetViewModel;
}
return null;
}
public GuarantorViewModel? Insert(GuarantorBindingModel model)
{
var newGuarantor = Guarantor.Create(model);
if (newGuarantor == null)
{
return null;
}
using var context = new TravelCompanyDatabase();
context.Guarantors.Add(newGuarantor);
context.SaveChanges();
return newGuarantor.GetViewModel;
}
public GuarantorViewModel? Update(GuarantorBindingModel model)
{
using var context = new TravelCompanyDatabase();
var guarantor = context.Guarantors.FirstOrDefault(x => x.Id == model.Id);
if (guarantor == null)
{
return null;
}
guarantor.Update(model);
context.SaveChanges();
return guarantor.GetViewModel;
}
public GuarantorViewModel? Delete(GuarantorBindingModel model)
{
using var context = new TravelCompanyDatabase();
var element = context.Guarantors.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
context.Guarantors.Remove(element);
context.SaveChanges();
return element.GetViewModel;
}
return null;
}
}
}

2
TravelCompany/TravelCompanyDatabaseImplement/Models/Contractor.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/ContractorModels/Contractor.cs
View File

@ -9,7 +9,7 @@ using TravelCompanyContracts.BindingModels.Contractor;
using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyDataModels.Models.Contractor;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.ContractorModels
{
public class Contractor : IContractorModel
{

2
TravelCompany/TravelCompanyDatabaseImplement/Models/Excursion.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/ContractorModels/Excursion.cs
View File

@ -11,7 +11,7 @@ using TravelCompanyDataModels.Models.Contractor;
using Microsoft.EntityFrameworkCore;
using TravelCompanyDatabaseImplement.Models.GuarantorModels;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.ContractorModels
{
public class Excursion : IExcursionModel
{

109
TravelCompany/TravelCompanyDatabaseImplement/Models/ContractorModels/ExcursionGroup.cs Normal file
View File

@ -0,0 +1,109 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using TravelCompanyContracts.BindingModels.Contractor;
using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyDataModels.Models.Contractor;
using Microsoft.EntityFrameworkCore;
using TravelCompanyDatabaseImplement.Models.GuarantorModels;
namespace TravelCompanyDatabaseImplement.Models.ContractorModels
{
public class ExcursionGroup : IExcursionGroupModel
{
public int Id { get; set; }
[Required]
public string ExcursionGroupName { get; set; } = string.Empty;
[Required]
public int PeopleAmount { get; set; }
[Required]
public int ContractorID { get; set; }
[DeleteBehavior(DeleteBehavior.Restrict)]
public virtual Contractor Contractor { get; set; }}
private Dictionary<int, ITourModel>? _excursionGroupTours = null;
[NotMapped]
public Dictionary<int, ITourModel> ExcursionGroupTours
{
get
{
if (_excursionGroupTours == null)
{
_excursionGroupTours = Tours
.ToDictionary(recPC => recPC.TourId, recPC => recPC.Tour as ITourModel);
}
return _excursionGroupTours;
}
}
[ForeignKey("ExcursionGroupId")]
public virtual List<ExcursionGroupTour> Tours { get; set; } = new();
public static ExcursionGroup? Create(TravelCompanyDatabase context, ExcursionGroupBindingModel? model)
{
if (model == null)
{
return null;
}
return new ExcursionGroup()
{
Id = model.Id,
ExcursionGroupName = model.ExcursionGroupName,
PeopleAmount = model.PeopleAmount,
ContractorID = model.ContractorID,
Tours = model.ExcursionGroupTours.Select(x => new ExcursionGroupTour
{
Tour = context.Tours.First(y => y.Id == x.Key)
}).ToList()
};
}
public void Update(ExcursionGroupBindingModel? model)
{
if (model == null)
{
return;
}
ExcursionGroupName = model.ExcursionGroupName;
PeopleAmount = model.PeopleAmount;
}
public ExcursionGroupViewModel GetViewModel => new()
{
Id = Id,
ExcursionGroupName = ExcursionGroupName,
PeopleAmount = PeopleAmount,
ContractorID = ContractorID,
ExcursionGroupTours = ExcursionGroupTours
};
public void UpdateTours(TravelCompanyDatabase context, ExcursionGroupBindingModel model)
{
var excursionGroupTours = context.ExcursionGroupTours.Where(rec => rec.ExcursionGroupId == model.Id).ToList();
if (excursionGroupTours != null && excursionGroupTours.Count > 0)
{
context.ExcursionGroupTours.RemoveRange(excursionGroupTours.Where(rec => !model.ExcursionGroupTours.ContainsKey(rec.TourId)));
context.SaveChanges();
}
var excursionGroup = context.ExcursionGroups.First(x => x.Id == Id);
foreach (var et in model.ExcursionGroupTours)
{
context.ExcursionGroupTours.Add(new ExcursionGroupTour
{
ExcursionGroup = excursionGroup,
Tour = context.Tours.First(x => x.Id == et.Key)
});
context.SaveChanges();
}
_excursionGroupTours = null;
}
}
}

2
TravelCompany/TravelCompanyDatabaseImplement/Models/ExcursionGroupTour.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/ContractorModels/ExcursionGroupTour.cs
View File

@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.ContractorModels
{
public class ExcursionGroupTour
{

2
TravelCompany/TravelCompanyDatabaseImplement/Models/ExcursionTour.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/ContractorModels/ExcursionTour.cs
View File

@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.ContractorModels
{
public class ExcursionTour
{

2
TravelCompany/TravelCompanyDatabaseImplement/Models/Tour.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/ContractorModels/Tour.cs
View File

@ -10,7 +10,7 @@ using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyDataModels.Models.Contractor;
using Microsoft.EntityFrameworkCore;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.ContractorModels
{
public class Tour : ITourModel
{

110
TravelCompany/TravelCompanyDatabaseImplement/Models/ExcursionGroup.cs
View File

@ -1,110 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using TravelCompanyContracts.BindingModels.Contractor;
using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyDataModels.Models.Contractor;
using Microsoft.EntityFrameworkCore;
using TravelCompanyDatabaseImplement.Models.GuarantorModels;
namespace TravelCompanyDatabaseImplement.Models
{
public class ExcursionGroup : IExcursionGroupModel
{
public int Id { get; set; }
[Required]
public string ExcursionGroupName { get; set; } = string.Empty;
[Required]
public int PeopleAmount { get; set; }
[Required]
public int ContractorID { get; set; }
[DeleteBehavior(DeleteBehavior.Restrict)]
public virtual Contractor Contractor { get; set; }
}
private Dictionary<int, ITourModel>? _excursionGroupTours = null;
[NotMapped]
public Dictionary<int, ITourModel> ExcursionGroupTours
{
get
{
if (_excursionGroupTours == null)
{
_excursionGroupTours = Tours
.ToDictionary(recPC => recPC.TourId, recPC => recPC.Tour as ITourModel);
}
return _excursionGroupTours;
}
}
[ForeignKey("ExcursionGroupId")]
public virtual List<ExcursionGroupTour> Tours { get; set; } = new();
public static ExcursionGroup? Create(TravelCompanyDatabase context, ExcursionGroupBindingModel? model)
{
if (model == null)
{
return null;
}
return new ExcursionGroup()
{
Id = model.Id,
ExcursionGroupName = model.ExcursionGroupName,
PeopleAmount = model.PeopleAmount,
ContractorID = model.ContractorID,
Tours = model.ExcursionGroupTours.Select(x => new ExcursionGroupTour
{
Tour = context.Tours.First(y => y.Id == x.Key)
}).ToList()
};
}
public void Update(ExcursionGroupBindingModel? model)
{
if (model == null)
{
return;
}
ExcursionGroupName = model.ExcursionGroupName;
PeopleAmount = model.PeopleAmount;
}
public ExcursionGroupViewModel GetViewModel => new()
{
Id = Id,
ExcursionGroupName = ExcursionGroupName,
PeopleAmount = PeopleAmount,
ContractorID = ContractorID,
ExcursionGroupTours = ExcursionGroupTours
};
public void UpdateTours(TravelCompanyDatabase context, ExcursionGroupBindingModel model)
{
var excursionGroupTours = context.ExcursionGroupTours.Where(rec => rec.ExcursionGroupId == model.Id).ToList();
if (excursionGroupTours != null && excursionGroupTours.Count > 0)
{
context.ExcursionGroupTours.RemoveRange(excursionGroupTours.Where(rec => !model.ExcursionGroupTours.ContainsKey(rec.TourId)));
context.SaveChanges();
}
var excursionGroup = context.ExcursionGroups.First(x => x.Id == Id);
foreach (var et in model.ExcursionGroupTours)
{
context.ExcursionGroupTours.Add(new ExcursionGroupTour
{
ExcursionGroup = excursionGroup,
Tour = context.Tours.First(x => x.Id == et.Key)
});
context.SaveChanges();
}
_excursionGroupTours = null;
}
}
}

2
TravelCompany/TravelCompanyDatabaseImplement/Models/Guarantor.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/GuarantorModels/Guarantor.cs
View File

@ -9,7 +9,7 @@ using TravelCompanyContracts.BindingModels.Guarantor;
using TravelCompanyContracts.ViewModels.Guarantor.ViewModels;
using TravelCompanyDataModels.Models.Guarantor;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.GuarantorModels
{
public class Guarantor : IGuarantorModel
{

2
TravelCompany/TravelCompanyDatabaseImplement/Models/Guide.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/GuarantorModels/Guide.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.GuarantorModels
{
internal class Guide
{

2
TravelCompany/TravelCompanyDatabaseImplement/Models/Place.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/GuarantorModels/Place.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.GuarantorModels
{
internal class Place
{

2
TravelCompany/TravelCompanyDatabaseImplement/Models/Trip.cs → TravelCompany/TravelCompanyDatabaseImplement/Models/GuarantorModels/Trip.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace TravelCompanyDatabaseImplement.Models
namespace TravelCompanyDatabaseImplement.Models.GuarantorModels
{
internal class Trip
{

4
TravelCompany/TravelCompanyDatabaseImplement/TravelCompanyDatabase.cs
View File

@ -3,9 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TravelCompanyDatabaseImplement.Models.ContractorModels;
using TravelCompanyDatabaseImplement.Models.GuarantorModels;
using Microsoft.EntityFrameworkCore;
using System.Security.Principal;
using TravelCompanyDatabaseImplement.Models;
namespace TravelCompanyDatabaseImplement
{