spacyboy/CourseWork_CarCenter
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправление ошибок

Browse Source
This commit is contained in:
spacyboy 2024-04-29 21:09:12 +04:00
parent 31287b8f1c
commit 544a1868c3
1 changed files with 65 additions and 64 deletions

129
CarCenter/CarCenterRestApi/Controllers/MainController.cs

@ -5,6 +5,7 @@ using CarCenterDataBaseImplement.Models;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using CarCenterContracts.ViewModels; using CarCenterContracts.ViewModels;
using CarCenterContracts.BindingModels; using CarCenterContracts.BindingModels;
using CarCenterDataBaseImplement;
namespace CarCenterRestApi.Controllers namespace CarCenterRestApi.Controllers
{ {
@ -20,64 +21,64 @@ namespace CarCenterRestApi.Controllers
private readonly IInspectionLogic _inspection; private readonly IInspectionLogic _inspection;
private readonly IEquipmentLogic _equipment; private readonly IEquipmentLogic _equipment;
public MainController(ILogger<MainController> logger, IConferenceLogic conference, IMemberLogic member, IMealPlanLogic mealPlan, ICarLogic car, IInspectionLogic inspection, IEquipmentLogic equipment) public MainController(ILogger<MainController> logger, IEmployeeLogic employee, ISaleLogic sale, IPreSaleWorkLogic preSaleWork, ICarLogic car, IInspectionLogic inspection, IEquipmentLogic equipment)
{ {
_logger = logger; _logger = logger;
_conference = conference; _employee = employee;
_member = member; _sale = sale;
_mealPlan = mealPlan; _preSaleWork = preSaleWork;
_car = car; _car = car;
_inspection = inspection; _inspection = inspection;
_equipment = equipment; _equipment = equipment;
} }
[HttpGet] [HttpGet]
public List<ConferenceViewModel>? GetConferenceList(int organiserId) public List<EmployeeViewModel>? GetEmployeeList(int managerId)
{ {
try try
{ {
return _conference.ReadList(new ConferenceSearchModel return _employee.ReadList(new EmployeeSearchModel
{ {
OrganiserId = organiserId, ManagerId = managerId,
}); });
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка получения списка конференций"); _logger.LogError(ex, "Ошибка получения списка сотрудников");
throw; throw;
} }
} }
[HttpGet] [HttpGet]
public List<MemberViewModel>? GetMemberList(int organiserId) public List<SaleViewModel>? GetSaleList(int managerId)
{ {
try try
{ {
return _member.ReadList(new MemberSearchModel return _sale.ReadList(new SaleSearchModel
{ {
OrganiserId = organiserId, ManagerId = managerId,
}); });
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка получения списка участников"); _logger.LogError(ex, "Ошибка получения списка продаж");
throw; throw;
} }
} }
[HttpGet] [HttpGet]
public List<MealPlanViewModel>? GetMealPlanList(int organiserId) public List<PreSaleWorkViewModel>? GetPreSaleWorkList(int managerId)
{ {
try try
{ {
return _mealPlan.ReadList(new MealPlanSearchModel return _preSaleWork.ReadList(new PreSaleWorkSearchModel
{ {
OrganiserId = organiserId, ManagerId = managerId,
}); });
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка получения списка планов питания"); _logger.LogError(ex, "Ошибка получения списка препродажной работы");
throw; throw;
} }
} }
@ -148,11 +149,11 @@ namespace CarCenterRestApi.Controllers
} }
[HttpPost] [HttpPost]
public void UpdateMember(MemberBindingModel model) public void UpdateSale(SaleBindingModel model)
{ {
try try
{ {
_member.Update(model); _sale.Update(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -162,46 +163,46 @@ namespace CarCenterRestApi.Controllers
} }
[HttpGet] [HttpGet]
public MemberViewModel? GetMember(int memberId) public SaleViewModel? GetSale(int saleId)
{ {
try try
{ {
return _member.ReadElement(new MemberSearchModel return _sale.ReadElement(new SaleSearchModel
{ {
Id = memberId Id = saleId
}); });
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка получения участника по id={Id}", memberId); _logger.LogError(ex, "Ошибка получения продажи по id={Id}", saleId);
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void CreateMember(MemberBindingModel model) public void CreateSale(SaleBindingModel model)
{ {
try try
{ {
_member.Create(model); _sale.Create(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка создания участника"); _logger.LogError(ex, "Ошибка создания продажи");
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void DeleteMember(MemberBindingModel model) public void DeleteSale(SaleBindingModel model)
{ {
try try
{ {
_member.Delete(model); _sale.Delete(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка удаления участника"); _logger.LogError(ex, "Ошибка удаления продажи");
throw; throw;
} }
} }
@ -266,26 +267,26 @@ namespace CarCenterRestApi.Controllers
} }
[HttpPost] [HttpPost]
public void CreateConference(ConferenceBindingModel model) public void CreateEmployee(EmployeeBindingModel model)
{ {
try try
{ {
_conference.Create(model); _employee.Create(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка создания конференции"); _logger.LogError(ex, "Ошибка создания сотрудника");
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void UpdateConference(ConferenceBindingModel model) public void UpdateEmployee(EmployeeBindingModel model)
{ {
try try
{ {
model.ConferenceMembers = null!; model.EmployeeSales = null!;
_conference.Update(model); _employee.Update(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -295,71 +296,71 @@ namespace CarCenterRestApi.Controllers
} }
[HttpGet] [HttpGet]
public Tuple<ConferenceViewModel, List<Tuple<string, string>>>? GetConference(int conferenceId) public Tuple<EmployeeViewModel, List<Tuple<string, string>>>? GetEmployee(int employeeId)
{ {
try try
{ {
var elem = _conference.ReadElement(new ConferenceSearchModel { Id = conferenceId }); var elem = _employee.ReadElement(new EmployeeSearchModel { Id = employeeId });
if (elem == null) if (elem == null)
return null; return null;
return Tuple.Create(elem, elem.ConferenceMembers.Select(x => Tuple.Create(x.Value.MemberFIO, x.Value.Citizenship)).ToList()); return Tuple.Create(elem, elem.EmployeeSales.Select(x => Tuple.Create(x.Value.SaleDate, x.Value.SalePrice)).ToList());
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка получения конференции по id={Id}", conferenceId); _logger.LogError(ex, "Ошибка получения сотрудника по id={Id}", employeeId);
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void DeleteConference(ConferenceBindingModel model) public void DeleteEmployee(EmployeeBindingModel model)
{ {
try try
{ {
_conference.Delete(model); _employee.Delete(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка удаления конференции"); _logger.LogError(ex, "Ошибка удаления сотрудника");
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void AddMemberToConference(Tuple<ConferenceSearchModel, MemberViewModel> model) public void AddSaleToEmployee(Tuple<EmployeeSearchModel, SaleViewModel> model)
{ {
try try
{ {
_conference.AddMemberToConference(model.Item1, model.Item2); _employee.AddSaleToEmployee(model.Item1, model.Item2);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка добавления участника в конференцию."); _logger.LogError(ex, "Ошибка добавления продажи в сотрудника.");
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void CreateMealPlan(MealPlanBindingModel model) public void CreatePreSaleWork(PreSaleWorkBindingModel model)
{ {
try try
{ {
_mealPlan.Create(model); _preSaleWork.Create(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка создания плана питания"); _logger.LogError(ex, "Ошибка создания предпродажной работы");
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void UpdateMealPlan(MealPlanBindingModel model) public void UpdatePreSaleWork(PreSaleWorkBindingModel model)
{ {
try try
{ {
model.MealPlanMembers = null!; model.PreSaleWorkSales = null!;
_mealPlan.Update(model); _preSaleWork.Update(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -369,47 +370,47 @@ namespace CarCenterRestApi.Controllers
} }
[HttpGet] [HttpGet]
public Tuple<MealPlanViewModel, List<Tuple<string, string>>, List<Tuple<string, string>>>? GetMealPlan(int mealPlanId) public Tuple<PreSaleWorkViewModel, List<Tuple<string, string>>, List<Tuple<string, string>>>? GetPreSaleWork(int preSaleWorkId)
{ {
try try
{ {
using var context = new HotelDataBase(); using var context = new CarCenterDataBase();
var elem = _mealPlan.ReadElement(new MealPlanSearchModel { Id = mealPlanId }); var elem = _preSaleWork.ReadElement(new PreSaleWorkSearchModel { Id = preSaleWorkId });
if (elem == null) if (elem == null)
return null; return null;
return Tuple.Create(elem, elem.MealPlanMembers.Select(x => Tuple.Create(x.Value.MemberFIO, x.Value.Citizenship)).ToList(), context.Rooms.Where(x => x.MealPlanId == elem.Id).Select(x => Tuple.Create(x.RoomName, x.RoomFrame)).ToList()); return Tuple.Create(elem, elem.PreSaleWorkSales.Select(x => Tuple.Create(x.Value.SaleDate, x.Value.SalePrice)).ToList(), context.Equipments.Where(x => x.PreSaleWorkId == elem.Id).Select(x => Tuple.Create(x.EquipmentName, x.EquipmentPrice)).ToList());
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка получения плана питания по id={Id}", mealPlanId); _logger.LogError(ex, "Ошибка получения препродажной работы по id={Id}", preSaleWorkId);
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void DeleteMealPlan(MealPlanBindingModel model) public void DeletePreSaleWork(PreSaleWorkBindingModel model)
{ {
try try
{ {
_mealPlan.Delete(model); _preSaleWork.Delete(model);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка удаления плана питания"); _logger.LogError(ex, "Ошибка удаления препродажной работы");
throw; throw;
} }
} }
[HttpPost] [HttpPost]
public void AddMemberToMealPlan(Tuple<MealPlanSearchModel, MemberViewModel> model) public void AddSaleToPreSaleWork(Tuple<PreSaleWorkSearchModel, SaleViewModel> model)
{ {
try try
{ {
_mealPlan.AddMemberToMealPlan(model.Item1, model.Item2); _preSaleWork.AddSaleToPreSaleWork(model.Item1, model.Item2);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка добавления участника в план питания."); _logger.LogError(ex, "Ошибка добавления продажи в препродажную работу.");
throw; throw;
} }
} }
@ -518,7 +519,7 @@ namespace CarCenterRestApi.Controllers
throw; throw;
} }
} }
return Tuple.Create(elem, elem.PreSaleWorkSales.Select(x => Tuple.Create(x.Value.SaleFIO, x.Value.SalePrice)).ToList(), context.Equipments.Where(x => x.PreSaleWorkId == elem.Id).Select(x => Tuple.Create(x.EquipmentName, x.EquipmentPrice)).ToList());
[HttpPost] [HttpPost]
public void UpdateInspection(InspectionBindingModel model) public void UpdateInspection(InspectionBindingModel model)
{ {
@ -581,11 +582,11 @@ namespace CarCenterRestApi.Controllers
} }
[HttpGet] [HttpGet]
public List<ConferenceViewModel>? GetConferences() public List<EmployeeViewModel>? GetEmployees()
{ {
try try
{ {
return _conference.ReadList(null); return _employee.ReadList(null);
} }
catch (Exception ex) catch (Exception ex)
{ {