Factorino73/PIbd-21_MasenkinMS_SUBD_RouteGuide
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Factorino73:MongoDBImplement
Branches Tags
Factorino73:main
Factorino73:MongoDBImplement
..
compare: Factorino73:main
Branches Tags
Factorino73:MongoDBImplement
Factorino73:main

No commits in common. "MongoDBImplement" and "main" have entirely different histories.
MongoDBImp ... main

67 changed files with 592 additions and 2663 deletions
Show Stats Expand all files Collapse all files

8
RouteGuide/RouteGuide.sln
View File

@ -11,9 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RouteGuideContracts", "Rout
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RouteGuideDatabaseImplement", "RouteGuideDatabaseImplement\RouteGuideDatabaseImplement.csproj", "{5C2BBCAA-01A8-4B4C-B296-E7CF8DFBA884}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RouteGuideBusinessLogics", "RouteGuideBusinessLogics\RouteGuideBusinessLogics.csproj", "{7B6C15DA-C491-4EE1-BEC8-C7FE580C2BA2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteGuideMongoDBImplement", "RouteGuideMongoDBImplement\RouteGuideMongoDBImplement.csproj", "{4FC074A5-4AB9-40C5-8833-B0A7D138F675}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteGuideBusinessLogics", "RouteGuideBusinessLogics\RouteGuideBusinessLogics.csproj", "{7B6C15DA-C491-4EE1-BEC8-C7FE580C2BA2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -41,10 +39,6 @@ Global
{7B6C15DA-C491-4EE1-BEC8-C7FE580C2BA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B6C15DA-C491-4EE1-BEC8-C7FE580C2BA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B6C15DA-C491-4EE1-BEC8-C7FE580C2BA2}.Release|Any CPU.Build.0 = Release|Any CPU
{4FC074A5-4AB9-40C5-8833-B0A7D138F675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FC074A5-4AB9-40C5-8833-B0A7D138F675}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FC074A5-4AB9-40C5-8833-B0A7D138F675}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FC074A5-4AB9-40C5-8833-B0A7D138F675}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
RouteGuide/RouteGuideBusinessLogics/BusinessLogics/DriverLogic.cs
View File

@ -216,7 +216,7 @@ namespace RouteGuideBusinessLogics.BusinessLogics
{
Phone = model.Phone
});
if (element != null && !element.Id.Equals(model.Id))
if (element != null && element.Id != model.Id)
{
throw new InvalidOperationException("Водитель с таким номером телефона уже существует");
}

4
RouteGuide/RouteGuideBusinessLogics/BusinessLogics/RouteLogic.cs
View File

@ -204,7 +204,7 @@ namespace RouteGuideBusinessLogics.BusinessLogics
{
throw new ArgumentNullException("Не указано название маршрута", nameof(model.Name));
}
if (model.TransportId == null || (model.TransportId is int && (int)model.TransportId < 0))
if (model.TransportId < 0)
{
throw new ArgumentNullException("Некорректный идентификатор транспортного средства", nameof(model.TransportId));
}
@ -215,7 +215,7 @@ namespace RouteGuideBusinessLogics.BusinessLogics
{
Name = model.Name
});
if (element != null && !element.Id.Equals(model.Id))
if (element != null && element.Id != model.Id)
{
throw new InvalidOperationException("Маршрут с таким названием уже существует");
}

2
RouteGuide/RouteGuideBusinessLogics/BusinessLogics/ScheduleLogic.cs
View File

@ -200,7 +200,7 @@ namespace RouteGuideBusinessLogics.BusinessLogics
{
return;
}
if (model.RouteId == null || (model.RouteId is int && (int)model.RouteId < 0))
if (model.RouteId < 0)
{
throw new ArgumentNullException("Некорректный идентификатор маршрута", nameof(model.RouteId));
}

2
RouteGuide/RouteGuideBusinessLogics/BusinessLogics/StopLogic.cs
View File

@ -219,7 +219,7 @@ namespace RouteGuideBusinessLogics.BusinessLogics
{
Name = model.Name
});
if (element != null && !element.Id.Equals(model.Id))
if (element != null && element.Id != model.Id)
{
throw new InvalidOperationException("Остановка с таким названием уже существует");
}

4
RouteGuide/RouteGuideBusinessLogics/BusinessLogics/TransportLogic.cs
View File

@ -208,7 +208,7 @@ namespace RouteGuideBusinessLogics.BusinessLogics
{
throw new ArgumentNullException("Вместимость транспортного средства должна быть положительным числом", nameof(model.Capacity));
}
if (model.DriverId == null || (model.DriverId is int && (int)model.DriverId < 0))
if (model.DriverId < 0)
{
throw new ArgumentNullException("Некорректный идентификатор водителя", nameof(model.DriverId));
}
@ -219,7 +219,7 @@ namespace RouteGuideBusinessLogics.BusinessLogics
{
License = model.License
});
if (element != null && !element.Id.Equals(model.Id))
if (element != null && element.Id != model.Id)
{
throw new InvalidOperationException("Транспортное средство с таким номерным знаком уже есть");
}

4
RouteGuide/RouteGuideContracts/BindingModels/DriverBindingModel.cs
View File

@ -11,12 +11,12 @@ namespace RouteGuideContracts.BindingModels
/// Модель для передачи данных пользователя
/// в методы для сохранения данных для водителей
/// </summary>
public class DriverBindingModel : IDriverModel<object>
public class DriverBindingModel : IDriverModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// ФИО водителя

8
RouteGuide/RouteGuideContracts/BindingModels/RouteBindingModel.cs
View File

@ -11,12 +11,12 @@ namespace RouteGuideContracts.BindingModels
/// Модель для передачи данных пользователя
/// в методы для сохранения данных для маршрутов
/// </summary>
public class RouteBindingModel : IRouteModel<object>
public class RouteBindingModel : IRouteModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Название маршрута
@ -26,12 +26,12 @@ namespace RouteGuideContracts.BindingModels
/// <summary>
/// Идентификатор транспорта
/// </summary>
public object TransportId { get; set; }
public int TransportId { get; set; }
/// <summary>
/// Коллекция остановок маршрута
/// </summary>
public Dictionary<object, (IStopModel<object>, int)> RouteStops
public Dictionary<int, (IStopModel, int)> RouteStops
{
get;
set;

6
RouteGuide/RouteGuideContracts/BindingModels/ScheduleBindingModel.cs
View File

@ -11,12 +11,12 @@ namespace RouteGuideContracts.BindingModels
/// Модель для передачи данных пользователя
/// в методы для сохранения данных для расписания
/// </summary>
public class ScheduleBindingModel : IScheduleModel<object>
public class ScheduleBindingModel : IScheduleModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Дата записи расписания
@ -41,6 +41,6 @@ namespace RouteGuideContracts.BindingModels
/// <summary>
/// Идентификатор маршрута
/// </summary>
public object RouteId { get; set; }
public int RouteId { get; set; }
}
}

4
RouteGuide/RouteGuideContracts/BindingModels/StopBindingModel.cs
View File

@ -11,12 +11,12 @@ namespace RouteGuideContracts.BindingModels
/// Модель для передачи данных пользователя
/// в методы для сохранения данных для остановок
/// </summary>
public class StopBindingModel : IStopModel<object>
public class StopBindingModel : IStopModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Название остановки

6
RouteGuide/RouteGuideContracts/BindingModels/TransportBindingModel.cs
View File

@ -12,12 +12,12 @@ namespace RouteGuideContracts.BindingModels
/// Модель для передачи данных пользователя
/// в методы для сохранения данных для транспорта
/// </summary>
public class TransportBindingModel : ITransportModel<object>
public class TransportBindingModel : ITransportModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Номерной знак
@ -37,6 +37,6 @@ namespace RouteGuideContracts.BindingModels
/// <summary>
/// Идентификатор водителя
/// </summary>
public object DriverId { get; set; }
public int DriverId { get; set; }
}
}

2
RouteGuide/RouteGuideContracts/SearchModels/DriverSearchModel.cs
View File

@ -15,7 +15,7 @@ namespace RouteGuideContracts.SearchModels
/// <summary>
/// Идентификатор
/// </summary>
public object? Id { get; set; }
public int? Id { get; set; }
/// <summary>
/// Номер телефона водителя

2
RouteGuide/RouteGuideContracts/SearchModels/RouteSearchModel.cs
View File

@ -15,7 +15,7 @@ namespace RouteGuideContracts.SearchModels
/// <summary>
/// Идентификатор
/// </summary>
public object? Id { get; set; }
public int? Id { get; set; }
/// <summary>
/// Название маршрута

2
RouteGuide/RouteGuideContracts/SearchModels/ScheduleSearchModel.cs
View File

@ -15,6 +15,6 @@ namespace RouteGuideContracts.SearchModels
/// <summary>
/// Идентификатор
/// </summary>
public object? Id { get; set; }
public int? Id { get; set; }
}
}

2
RouteGuide/RouteGuideContracts/SearchModels/StopSearchModel.cs
View File

@ -15,7 +15,7 @@ namespace RouteGuideContracts.SearchModels
/// <summary>
/// Идентификатор
/// </summary>
public object? Id { get; set; }
public int? Id { get; set; }
/// <summary>
/// Название остановки

2
RouteGuide/RouteGuideContracts/SearchModels/TransportSearchModel.cs
View File

@ -15,7 +15,7 @@ namespace RouteGuideContracts.SearchModels
/// <summary>
/// Идентификатор
/// </summary>
public object? Id { get; set; }
public int? Id { get; set; }
/// <summary>
/// Номерной знак

4
RouteGuide/RouteGuideContracts/ViewModels/DriverViewModel.cs
View File

@ -12,12 +12,12 @@ namespace RouteGuideContracts.ViewModels
/// Модель для передачи данных пользователю
/// для отображения для водителей
/// </summary>
public class DriverViewModel : IDriverModel<object>
public class DriverViewModel : IDriverModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// ФИО водителя

8
RouteGuide/RouteGuideContracts/ViewModels/RouteViewModel.cs
View File

@ -12,12 +12,12 @@ namespace RouteGuideContracts.ViewModels
/// Модель для передачи данных пользователю
/// для отображения для маршрутов
/// </summary>
public class RouteViewModel : IRouteModel<object>
public class RouteViewModel : IRouteModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Название маршрута
@ -28,7 +28,7 @@ namespace RouteGuideContracts.ViewModels
/// <summary>
/// Идентификатор транспорта
/// </summary>
public object TransportId { get; set; }
public int TransportId { get; set; }
/// <summary>
/// Номерной знак транспорта
@ -39,7 +39,7 @@ namespace RouteGuideContracts.ViewModels
/// <summary>
/// Коллекция остановок маршрута
/// </summary>
public Dictionary<object, (IStopModel<object>, int)> RouteStops
public Dictionary<int, (IStopModel, int)> RouteStops
{
get;
set;

6
RouteGuide/RouteGuideContracts/ViewModels/ScheduleViewModel.cs
View File

@ -12,12 +12,12 @@ namespace RouteGuideContracts.ViewModels
/// Модель для передачи данных пользователю
/// для отображения для расписания
/// </summary>
public class ScheduleViewModel : IScheduleModel<object>
public class ScheduleViewModel : IScheduleModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Дата записи расписания
@ -46,7 +46,7 @@ namespace RouteGuideContracts.ViewModels
/// <summary>
/// Идентификатор маршрута
/// </summary>
public object RouteId { get; set; }
public int RouteId { get; set; }
/// <summary>
/// Название маршрута

4
RouteGuide/RouteGuideContracts/ViewModels/StopViewModel.cs
View File

@ -12,12 +12,12 @@ namespace RouteGuideContracts.ViewModels
/// Модель для передачи данных пользователю
/// для отображения для остановок
/// </summary>
public class StopViewModel : IStopModel<object>
public class StopViewModel : IStopModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Название остановки

6
RouteGuide/RouteGuideContracts/ViewModels/TransportViewModel.cs
View File

@ -13,12 +13,12 @@ namespace RouteGuideContracts.ViewModels
/// Модель для передачи данных пользователю
/// для отображения для транспорта
/// </summary>
public class TransportViewModel : ITransportModel<object>
public class TransportViewModel : ITransportModel
{
/// <summary>
/// Идентификатор
/// </summary>
public object Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Номерной знак
@ -41,7 +41,7 @@ namespace RouteGuideContracts.ViewModels
/// <summary>
/// Идентификатор водителя
/// </summary>
public object DriverId { get; set; }
public int DriverId { get; set; }
/// <summary>
/// ФИО водителя

5
RouteGuide/RouteGuideDataModels/IId.cs
View File

@ -9,12 +9,11 @@ namespace RouteGuideDataModels
/// <summary>
/// Интерфейс для идентификатора
/// </summary>
public interface IId<T>
public interface IId
{
/// <summary>
/// Идентификатор
/// </summary>
T Id { get; }
int Id { get; }
}
}

2
RouteGuide/RouteGuideDataModels/Models/IDriverModel.cs
View File

@ -9,7 +9,7 @@ namespace RouteGuideDataModels.Models
/// <summary>
/// Интерфейс для модели водителя
/// </summary>
public interface IDriverModel<T> : IId<T>
public interface IDriverModel : IId
{
/// <summary>
/// ФИО водителя

6
RouteGuide/RouteGuideDataModels/Models/IRouteModel.cs
View File

@ -9,7 +9,7 @@ namespace RouteGuideDataModels.Models
/// <summary>
/// Интерфейс для модели маршрута
/// </summary>
public interface IRouteModel<T> : IId<T>
public interface IRouteModel : IId
{
/// <summary>
/// Название маршрута
@ -19,11 +19,11 @@ namespace RouteGuideDataModels.Models
/// <summary>
/// Идентификатор транспорта
/// </summary>
T TransportId { get; }
int TransportId { get; }
/// <summary>
/// Коллекция остановок маршрута
/// </summary>
Dictionary<T, (IStopModel<T>, int)> RouteStops { get; }
Dictionary<int, (IStopModel, int)> RouteStops { get; }
}
}

4
RouteGuide/RouteGuideDataModels/Models/IScheduleModel.cs
View File

@ -9,7 +9,7 @@ namespace RouteGuideDataModels.Models
/// <summary>
/// Интерфейс для модели расписания
/// </summary>
public interface IScheduleModel<T> : IId<T>
public interface IScheduleModel : IId
{
/// <summary>
/// Дата записи расписания
@ -34,6 +34,6 @@ namespace RouteGuideDataModels.Models
/// <summary>
/// Идентификатор маршрута
/// </summary>
T RouteId { get; }
int RouteId { get; }
}
}

2
RouteGuide/RouteGuideDataModels/Models/IStopModel.cs
View File

@ -9,7 +9,7 @@ namespace RouteGuideDataModels.Models
/// <summary>
/// Интерфейс для модели остановки
/// </summary>
public interface IStopModel<T> : IId<T>
public interface IStopModel : IId
{
/// <summary>
/// Название остановки

4
RouteGuide/RouteGuideDataModels/Models/ITransportModel.cs
View File

@ -10,7 +10,7 @@ namespace RouteGuideDataModels.Models
/// <summary>
/// Интерфейс для модели транспорта
/// </summary>
public interface ITransportModel<T> : IId<T>
public interface ITransportModel : IId
{
/// <summary>
/// Номерной знак
@ -30,6 +30,6 @@ namespace RouteGuideDataModels.Models
/// <summary>
/// Идентификатор водителя
/// </summary>
T DriverId { get; }
int DriverId { get; }
}
}

8
RouteGuide/RouteGuideDatabaseImplement/Implements/DriverStorage.cs
View File

@ -74,14 +74,14 @@ namespace RouteGuideDatabaseImplement.Implements
/// <returns></returns>
public DriverViewModel? GetElement(DriverSearchModel model)
{
if (model.Id == null && string.IsNullOrEmpty(model.Phone))
if (!model.Id.HasValue && string.IsNullOrEmpty(model.Phone))
{
return null;
}
using var context = new RouteGuideDatabase();
return context.Drivers
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Phone) && x.Phone.Contains(model.Phone)) || (model.Id != null && x.Id.Equals(model.Id)))
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Phone) && x.Phone.Contains(model.Phone)) || (model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
@ -112,7 +112,7 @@ namespace RouteGuideDatabaseImplement.Implements
public DriverViewModel? Update(DriverBindingModel model)
{
using var context = new RouteGuideDatabase();
var driver = context.Drivers.FirstOrDefault(x => x.Id.Equals(model.Id));
var driver = context.Drivers.FirstOrDefault(x => x.Id == model.Id);
if (driver == null)
{
return null;
@ -131,7 +131,7 @@ namespace RouteGuideDatabaseImplement.Implements
public DriverViewModel? Delete(DriverBindingModel model)
{
using var context = new RouteGuideDatabase();
var driver = context.Drivers.FirstOrDefault(x => x.Id.Equals(model.Id));
var driver = context.Drivers.FirstOrDefault(x => x.Id == model.Id);
if (driver == null)
{
return null;

8
RouteGuide/RouteGuideDatabaseImplement/Implements/RouteStorage.cs
View File

@ -86,7 +86,7 @@ namespace RouteGuideDatabaseImplement.Implements
/// <returns></returns>
public RouteViewModel? GetElement(RouteSearchModel model)
{
if (model.Id == null && string.IsNullOrEmpty(model.Name))
if (!model.Id.HasValue && string.IsNullOrEmpty(model.Name))
{
return null;
}
@ -96,7 +96,7 @@ namespace RouteGuideDatabaseImplement.Implements
.Include(x => x.Transport)
.Include(x => x.Stops)
.ThenInclude(x => x.Stop)
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Name) && x.Name.Contains(model.Name)) || (model.Id != null && x.Id.Equals(model.Id)))
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Name) && x.Name.Contains(model.Name)) || (model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
@ -130,7 +130,7 @@ namespace RouteGuideDatabaseImplement.Implements
using var transaction = context.Database.BeginTransaction();
try
{
var route = context.Routes.FirstOrDefault(x => x.Id.Equals(model.Id));
var route = context.Routes.FirstOrDefault(x => x.Id == model.Id);
if (route == null)
{
return null;
@ -159,7 +159,7 @@ namespace RouteGuideDatabaseImplement.Implements
using var context = new RouteGuideDatabase();
var route = context.Routes
.Include(x => x.Stops)
.FirstOrDefault(rec => rec.Id.Equals(model.Id));
.FirstOrDefault(rec => rec.Id == model.Id);
if (route == null)
{
return null;

12
RouteGuide/RouteGuideDatabaseImplement/Implements/ScheduleStorage.cs
View File

@ -37,7 +37,7 @@ namespace RouteGuideDatabaseImplement.Implements
/// <returns></returns>
public List<ScheduleViewModel> GetFilteredList(ScheduleSearchModel model)
{
if (model.Id == null)
if (!model.Id.HasValue)
{
return new();
}
@ -45,7 +45,7 @@ namespace RouteGuideDatabaseImplement.Implements
using var context = new RouteGuideDatabase();
return context.Schedules
.Include(x => x.Route)
.Where(x => x.Id.Equals(model.Id))
.Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel)
.ToList();
}
@ -77,7 +77,7 @@ namespace RouteGuideDatabaseImplement.Implements
/// <returns></returns>
public ScheduleViewModel? GetElement(ScheduleSearchModel model)
{
if (model.Id == null)
if (!model.Id.HasValue)
{
return null;
}
@ -85,7 +85,7 @@ namespace RouteGuideDatabaseImplement.Implements
using var context = new RouteGuideDatabase();
return context.Schedules
.Include(x => x.Route)
.FirstOrDefault(x => (model.Id != null && x.Id.Equals(model.Id)))
.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
@ -116,7 +116,7 @@ namespace RouteGuideDatabaseImplement.Implements
public ScheduleViewModel? Update(ScheduleBindingModel model)
{
using var context = new RouteGuideDatabase();
var schedule = context.Schedules.FirstOrDefault(x => x.Id.Equals(model.Id));
var schedule = context.Schedules.FirstOrDefault(x => x.Id == model.Id);
if (schedule == null)
{
return null;
@ -135,7 +135,7 @@ namespace RouteGuideDatabaseImplement.Implements
public ScheduleViewModel? Delete(ScheduleBindingModel model)
{
using var context = new RouteGuideDatabase();
var schedule = context.Schedules.FirstOrDefault(x => x.Id.Equals(model.Id));
var schedule = context.Schedules.FirstOrDefault(x => x.Id == model.Id);
if (schedule == null)
{
return null;

8
RouteGuide/RouteGuideDatabaseImplement/Implements/StopStorage.cs
View File

@ -73,14 +73,14 @@ namespace RouteGuideDatabaseImplement.Implements
/// <returns></returns>
public StopViewModel? GetElement(StopSearchModel model)
{
if (model.Id == null && string.IsNullOrEmpty(model.Name))
if (!model.Id.HasValue && string.IsNullOrEmpty(model.Name))
{
return null;
}
using var context = new RouteGuideDatabase();
return context.Stops
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Name) && x.Name.Contains(model.Name)) || (model.Id != null && x.Id.Equals(model.Id)))
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Name) && x.Name.Contains(model.Name)) || (model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
@ -111,7 +111,7 @@ namespace RouteGuideDatabaseImplement.Implements
public StopViewModel? Update(StopBindingModel model)
{
using var context = new RouteGuideDatabase();
var stop = context.Stops.FirstOrDefault(x => x.Id.Equals(model.Id));
var stop = context.Stops.FirstOrDefault(x => x.Id == model.Id);
if (stop == null)
{
return null;
@ -130,7 +130,7 @@ namespace RouteGuideDatabaseImplement.Implements
public StopViewModel? Delete(StopBindingModel model)
{
using var context = new RouteGuideDatabase();
var stop = context.Stops.FirstOrDefault(x => x.Id.Equals(model.Id));
var stop = context.Stops.FirstOrDefault(x => x.Id == model.Id);
if (stop == null)
{
return null;

8
RouteGuide/RouteGuideDatabaseImplement/Implements/TransportStorage.cs
View File

@ -77,7 +77,7 @@ namespace RouteGuideDatabaseImplement.Implements
/// <returns></returns>
public TransportViewModel? GetElement(TransportSearchModel model)
{
if (model.Id == null && string.IsNullOrEmpty(model.License))
if (!model.Id.HasValue && string.IsNullOrEmpty(model.License))
{
return null;
}
@ -85,7 +85,7 @@ namespace RouteGuideDatabaseImplement.Implements
using var context = new RouteGuideDatabase();
return context.Transport
.Include(x => x.Driver)
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.License) && x.License.Contains(model.License)) || (model.Id != null && x.Id.Equals(model.Id)))
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.License) && x.License.Contains(model.License)) || (model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
@ -116,7 +116,7 @@ namespace RouteGuideDatabaseImplement.Implements
public TransportViewModel? Update(TransportBindingModel model)
{
using var context = new RouteGuideDatabase();
var transport = context.Transport.FirstOrDefault(x => x.Id.Equals(model.Id));
var transport = context.Transport.FirstOrDefault(x => x.Id == model.Id);
if (transport == null)
{
return null;
@ -135,7 +135,7 @@ namespace RouteGuideDatabaseImplement.Implements
public TransportViewModel? Delete(TransportBindingModel model)
{
using var context = new RouteGuideDatabase();
var transport = context.Transport.FirstOrDefault(x => x.Id.Equals(model.Id));
var transport = context.Transport.FirstOrDefault(x => x.Id == model.Id);
if (transport == null)
{
return null;

6
RouteGuide/RouteGuideDatabaseImplement/Models/Driver.cs
View File

@ -13,7 +13,7 @@ namespace RouteGuideDatabaseImplement.Models
/// <summary>
/// Сущность "Водитель"
/// </summary>
public class Driver : IDriverModel<int>
public class Driver : IDriverModel
{
/// <summary>
/// Идентификатор
@ -51,7 +51,7 @@ namespace RouteGuideDatabaseImplement.Models
return new Driver()
{
Id = (int)model.Id,
Id = model.Id,
FullName = model.FullName,
Phone = model.Phone,
Experience = model.Experience
@ -72,7 +72,7 @@ namespace RouteGuideDatabaseImplement.Models
return new Driver()
{
Id = (int)model.Id,
Id = model.Id,
FullName = model.FullName,
Phone = model.Phone,
Experience = model.Experience

29
RouteGuide/RouteGuideDatabaseImplement/Models/Route.cs
View File

@ -15,7 +15,7 @@ namespace RouteGuideDatabaseImplement.Models
/// <summary>
/// Сущность "Маршрут"
/// </summary>
public class Route : IRouteModel<int>
public class Route : IRouteModel
{
/// <summary>
/// Идентификатор
@ -42,20 +42,20 @@ namespace RouteGuideDatabaseImplement.Models
/// <summary>
/// Коллекция остановок маршрута
/// </summary>
private Dictionary<int, (IStopModel<int>, int)>? _routeStops = null;
private Dictionary<int, (IStopModel, int)>? _routeStops = null;
/// <summary>
/// Коллекция остановок маршрута
/// </summary>
[NotMapped]
public Dictionary<int, (IStopModel<int>, int)> RouteStops
public Dictionary<int, (IStopModel, int)> RouteStops
{
get
{
if (_routeStops == null)
{
_routeStops = Stops
.ToDictionary(recRS => recRS.StopId, recRS => (recRS.Stop as IStopModel<int>, recRS.Number));
.ToDictionary(recRS => recRS.StopId, recRS => (recRS.Stop as IStopModel, recRS.Number));
}
return _routeStops;
}
@ -77,14 +77,14 @@ namespace RouteGuideDatabaseImplement.Models
{
return new Route()
{
Id = (int)model.Id,
Id = model.Id,
Name = model.Name,
TransportId = (int)model.TransportId,
TransportId = model.TransportId,
Transport = context.Transport
.FirstOrDefault(x => x.Id.Equals(model.TransportId)),
.FirstOrDefault(x => x.Id == model.TransportId),
Stops = model.RouteStops.Select(x => new RouteStop
{
Stop = context.Stops.First(y => y.Id.Equals(x.Key)),
Stop = context.Stops.First(y => y.Id == x.Key),
Number = x.Value.Item2
}).ToList()
};
@ -112,14 +112,7 @@ namespace RouteGuideDatabaseImplement.Models
Id = Id,
Name = Name,
TransportId = TransportId,
RouteStops = RouteStops
.ToDictionary(recRS => (object)recRS.Key, recRS => (new StopViewModel()
{
Id = (object)recRS.Value.Item1.Id,
Name = recRS.Value.Item1.Name,
Street = recRS.Value.Item1.Street,
Number = recRS.Value.Item1.Number
} as IStopModel<object>, recRS.Value.Item2)),
RouteStops = RouteStops,
TransportLicense = Transport.License
};
@ -130,7 +123,7 @@ namespace RouteGuideDatabaseImplement.Models
/// <param name="model"></param>
public void UpdateStops(RouteGuideDatabase context, RouteBindingModel model)
{
var routeStops = context.RouteStops.Where(rec => rec.RouteId.Equals(model.Id)).ToList();
var routeStops = context.RouteStops.Where(rec => rec.RouteId == model.Id).ToList();
if (routeStops != null && routeStops.Count > 0)
{
// Удаление остановок, которых нет в маршруте
@ -151,7 +144,7 @@ namespace RouteGuideDatabaseImplement.Models
context.RouteStops.Add(new RouteStop
{
Route = route,
Stop = context.Stops.First(x => x.Id.Equals(rs.Key)),
Stop = context.Stops.First(x => x.Id == rs.Key),
Number = rs.Value.Item2
});
context.SaveChanges();

8
RouteGuide/RouteGuideDatabaseImplement/Models/Schedule.cs
View File

@ -15,7 +15,7 @@ namespace RouteGuideDatabaseImplement.Models
/// <summary>
/// Сущность "Расписание"
/// </summary>
public class Schedule : IScheduleModel<int>
public class Schedule : IScheduleModel
{
/// <summary>
/// Идентификатор
@ -71,14 +71,14 @@ namespace RouteGuideDatabaseImplement.Models
return new Schedule()
{
Id = (int)model.Id,
Id = model.Id,
Date = model.Date,
DepartureTime = model.DepartureTime,
ArrivalTime = model.ArrivalTime,
Frequency = model.Frequency,
RouteId = (int)model.RouteId,
RouteId = model.RouteId,
Route = context.Routes
.FirstOrDefault(x => x.Id.Equals(model.RouteId))
.FirstOrDefault(x => x.Id == model.RouteId)
};
}

6
RouteGuide/RouteGuideDatabaseImplement/Models/Stop.cs
View File

@ -14,7 +14,7 @@ namespace RouteGuideDatabaseImplement.Models
/// <summary>
/// Сущность "Остановка"
/// </summary>
public class Stop : IStopModel<int>
public class Stop : IStopModel
{
/// <summary>
/// Идентификатор
@ -53,7 +53,7 @@ namespace RouteGuideDatabaseImplement.Models
return new Stop()
{
Id = (int)model.Id,
Id = model.Id,
Name = model.Name,
Street = model.Street,
Number = model.Number
@ -74,7 +74,7 @@ namespace RouteGuideDatabaseImplement.Models
return new Stop()
{
Id = (int)model.Id,
Id = model.Id,
Name = model.Name,
Street = model.Street,
Number = model.Number

8
RouteGuide/RouteGuideDatabaseImplement/Models/Transport.cs
View File

@ -16,7 +16,7 @@ namespace RouteGuideDatabaseImplement.Models
/// <summary>
/// Сущность "Транспорт"
/// </summary>
public class Transport : ITransportModel<int>
public class Transport : ITransportModel
{
/// <summary>
/// Идентификатор
@ -66,13 +66,13 @@ namespace RouteGuideDatabaseImplement.Models
return new Transport()
{
Id = (int)model.Id,
Id = model.Id,
License = model.License,
Type = model.Type,
Capacity = model.Capacity,
DriverId = (int)model.DriverId,
DriverId = model.DriverId,
Driver = context.Drivers
.FirstOrDefault(x => x.Id.Equals(model.DriverId))
.FirstOrDefault(x => x.Id == model.DriverId)
};
}

234
RouteGuide/RouteGuideMongoDBImplement/DataTransfer.cs
View File

@ -1,234 +0,0 @@
using MongoDB.Bson;
using MongoDB.Driver;
using Npgsql;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RouteGuideMongoDBImplement
{
/// <summary>
/// Класс для переноса данных между БД
/// </summary>
public class DataTransfer
{
/// <summary>
/// Параметры подключения к базе данных PostgreSQL
/// </summary>
private readonly string _pgsqlDBConnectionString = "Host=192.168.0.108;Port=5432;Database=RouteGuide;Username=postgres;Password=2004";
/// <summary>
/// Параметры подключения к базе данных MongoDB
/// </summary>
private readonly string _mongoDBConnectionString = "mongodb://localhost:27017";
/// <summary>
/// Название базы данных
/// </summary>
private readonly string _databaseName = "RouteGuideDatabase";
/// <summary>
/// Клиент MongoDB
/// </summary>
public readonly MongoClient _client;
/// <summary>
/// База данных MongoDB
/// </summary>
private readonly IMongoDatabase _database;
/// <summary>
/// Коллекция "Водители"
/// </summary>
private IMongoCollection<BsonDocument> Drivers => _database.GetCollection<BsonDocument>("Drivers");
/// <summary>
/// Коллекция "Транспорт"
/// </summary>
private IMongoCollection<BsonDocument> Transport => _database.GetCollection<BsonDocument>("Transport");
/// <summary>
/// Коллекция "Маршруты"
/// </summary>
private IMongoCollection<BsonDocument> Routes => _database.GetCollection<BsonDocument>("Routes");
/// <summary>
/// Коллекция "Остановки"
/// </summary>
private IMongoCollection<BsonDocument> Stops => _database.GetCollection<BsonDocument>("Stops");
/// <summary>
/// Связь для сущностей "Маршруты" и "Остановки"
/// </summary>
private IMongoCollection<BsonDocument> RouteStops => _database.GetCollection<BsonDocument>("RouteStops");
/// <summary>
/// Коллекция "Расписания"
/// </summary>
private IMongoCollection<BsonDocument> Schedules => _database.GetCollection<BsonDocument>("Schedules");
/// <summary>
/// Конструктор
/// </summary>
public DataTransfer()
{
_client = new MongoClient(_mongoDBConnectionString);
_database = _client.GetDatabase(_databaseName);
}
/// <summary>
/// Начать перенос данных
/// </summary>
public void SyncData()
{
// Переносим данные
Transfer("Drivers");
Transfer("Transport");
Transfer("Routes");
Transfer("Stops");
Transfer("RouteStops");
Transfer("Schedules");
// Настраиваем корректные связи
var transportCollection = Transport.Find(Builders<BsonDocument>.Filter.Empty).ToList();
var routesCollection = Routes.Find(Builders<BsonDocument>.Filter.Empty).ToList();
var schedulesCollection = Schedules.Find(Builders<BsonDocument>.Filter.Empty).ToList();
// Связь между сущностями "Транспорт" и "Водитель"
transportCollection.ForEach(t =>
{
int tempDriverId = t.GetValue("DriverId").ToInt32();
var driverId = Drivers
.Find(Builders<BsonDocument>.Filter.Eq("Id", tempDriverId))
.FirstOrDefaultAsync()
.Result.GetValue("_id")
.ToString();
var driver = Drivers
.Find(Builders<BsonDocument>.Filter.Eq("Id", tempDriverId))
.Project(Builders<BsonDocument>.Projection.Exclude("Id"))
.FirstOrDefault();
var filter = Builders<BsonDocument>.Filter.Eq("_id", t.GetValue("_id"));
var updateDriverId = Builders<BsonDocument>.Update.Set("DriverId", driverId);
var updateDriver = Builders<BsonDocument>.Update.Set("Driver", driver);
Transport.UpdateOneAsync(filter, updateDriverId);
Transport.UpdateOneAsync(filter, updateDriver);
});
// Связь между сущностями "Маршрут" и "Транспорт"
routesCollection.ForEach(r =>
{
int tempTransportId = r.GetValue("TransportId").ToInt32();
var transportId = Transport
.Find(Builders<BsonDocument>.Filter.Eq("Id", tempTransportId))
.FirstOrDefaultAsync()
.Result.GetValue("_id")
.ToString();
var transport = Transport
.Find(Builders<BsonDocument>.Filter.Eq("Id", tempTransportId))
.Project(Builders<BsonDocument>.Projection.Exclude("Id"))
.FirstOrDefault();
var filter = Builders<BsonDocument>.Filter.Eq("_id", r.GetValue("_id"));
var updateTransportId = Builders<BsonDocument>.Update.Set("TransportId", transportId);
var updateTransport = Builders<BsonDocument>.Update.Set("Transport", transport);
Routes.UpdateOneAsync(filter, updateTransportId);
Routes.UpdateOneAsync(filter, updateTransport);
});
// Связь между сущностями "Маршруты" и "Остановки"
routesCollection.ForEach(r =>
{
var tempRouteId = r.GetValue("Id").ToInt32();
var routeStops = RouteStops
.Find(Builders<BsonDocument>.Filter.Eq("RouteId", tempRouteId))
.ToList();
var updateStops = new Dictionary<string, (BsonDocument, int)>();
routeStops.ForEach(rs =>
{
var tempStopId = rs.GetValue("StopId").ToInt32();
var stop = Stops
.Find(Builders<BsonDocument>.Filter.Eq("Id", tempStopId))
.Project(Builders<BsonDocument>.Projection.Exclude("Id"))
.FirstOrDefault();
if (stop != null)
{
var stopId = stop.GetValue("_id").ToString();
var stopNumber = rs.GetValue("Number").ToInt32();
updateStops.Add(stopId!, (stop, stopNumber));
}
});
var filter = Builders<BsonDocument>.Filter.Eq("_id", r.GetValue("_id"));
var update = Builders<BsonDocument>.Update.Set("Stops", updateStops);
Routes.UpdateOneAsync(filter, update);
});
// Связь между сущностями "Расписание" и "Маршрут"
schedulesCollection.ForEach(s =>
{
int tempRouteId = s.GetValue("RouteId").ToInt32();
var routeId = Routes
.Find(Builders<BsonDocument>.Filter.Eq("Id", tempRouteId))
.FirstOrDefaultAsync()
.Result.GetValue("_id")
.ToString();
var route = Routes
.Find(Builders<BsonDocument>.Filter.Eq("Id", tempRouteId))
.Project(Builders<BsonDocument>.Projection.Exclude("Id"))
.FirstOrDefault();
var filter = Builders<BsonDocument>.Filter.Eq("_id", s.GetValue("_id"));
var updateRouteId = Builders<BsonDocument>.Update.Set("RouteId", routeId);
var updateRoute = Builders<BsonDocument>.Update.Set("Route", route);
Schedules.UpdateOneAsync(filter, updateRouteId);
Schedules.UpdateOneAsync(filter, updateRoute);
});
// Убираем поле "Id"
var update = Builders<BsonDocument>.Update.Unset("Id");
Drivers.UpdateMany(new BsonDocument(), update);
Transport.UpdateMany(new BsonDocument(), update);
Routes.UpdateMany(new BsonDocument(), update);
Stops.UpdateMany(new BsonDocument(), update);
Schedules.UpdateMany(new BsonDocument(), update);
// Удаление коллекции для связи сущностей "Маршруты" и "Остановки"
RouteStops.Database.DropCollection("RouteStops");
}
/// <summary>
/// Перенос данных из таблицы в коллекцию
/// </summary>
/// <param name="collectionName"></param>
private void Transfer(string collectionName)
{
using var connection = new NpgsqlConnection(_pgsqlDBConnectionString);
connection.Open();
using var command = new NpgsqlCommand($"SELECT * FROM \"{collectionName}\"", connection);
using var reader = command.ExecuteReader();
var collection = _database.GetCollection<BsonDocument>(collectionName);
while (reader.Read())
{
var document = new BsonDocument();
for (int i = 0; i < reader.FieldCount; i++)
{
string fieldName = reader.GetName(i);
object value = reader.GetValue(i);
document.Add(fieldName, BsonValue.Create(value));
}
collection.InsertOne(document);
}
reader.Close();
command.Cancel();
connection.Close();
}
}
}

222
RouteGuide/RouteGuideMongoDBImplement/Implements/DriverStorage.cs
View File

@ -1,222 +0,0 @@
using MongoDB.Driver;
using MongoDB.Bson;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.SearchModels;
using RouteGuideContracts.StoragesContracts;
using RouteGuideContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RouteGuideMongoDBImplement.Models;
namespace RouteGuideMongoDBImplement.Implements
{
/// <summary>
/// Хранилище для сущности "Водитель"
/// </summary>
public class DriverStorage : IDriverStorage
{
/// <summary>
/// Получение полного списка
/// </summary>
/// <returns></returns>
public List<DriverViewModel> GetFullList()
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Driver>.Filter;
var filter = filterBuilder.Empty;
return context.Drivers
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение фильтрованного списка
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<DriverViewModel> GetFilteredList(DriverSearchModel model)
{
if (string.IsNullOrEmpty(model.Phone))
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Driver>.Filter;
var filter = filterBuilder.Eq(x => x.Phone, model.Phone);
return context.Drivers
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получить список из заданного количества элементов
/// </summary>
/// <param name="count"></param>
/// <returns></returns>
public List<DriverViewModel> GetList(int count)
{
if (count <= 0)
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Driver>.Filter;
var filter = filterBuilder.Empty;
return context.Drivers
.Find(filter)
.Limit(count)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public DriverViewModel? GetElement(DriverSearchModel model)
{
if (string.IsNullOrEmpty(model.Id?.ToString()) && string.IsNullOrEmpty(model.Phone))
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Driver>.Filter;
var filter = filterBuilder.Empty;
if (!string.IsNullOrEmpty(model.Phone))
{
filter &= filterBuilder.Eq(x => x.Phone, model.Phone);
}
if (!string.IsNullOrEmpty(model.Id?.ToString()))
{
filter &= filterBuilder.Eq(x => x.Id, model.Id);
}
return context.Drivers
.Find(filter)
.FirstOrDefault()
?.GetViewModel;
}
/// <summary>
/// Добавление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public DriverViewModel? Insert(DriverBindingModel model)
{
var newDriver = Driver.Create(model);
if (newDriver == null)
{
return null;
}
using var context = new RouteGuideDatabase();
context.Drivers.InsertOne(newDriver);
return newDriver.GetViewModel;
}
/// <summary>
/// Редактирование элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public DriverViewModel? Update(DriverBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Driver>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var driver = context.Drivers.Find(filter).FirstOrDefault();
if (driver == null)
{
return null;
}
driver.Update(model);
context.Drivers.ReplaceOne(filter, driver);
return driver.GetViewModel;
}
/// <summary>
/// Удаление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public DriverViewModel? Delete(DriverBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Driver>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var driver = context.Drivers.Find(filter).FirstOrDefault();
if (driver == null)
{
return null;
}
context.Drivers.FindOneAndDelete(filter);
return driver.GetViewModel;
}
/// <summary>
/// Удаление записи
/// </summary>
/// <returns></returns>
public DriverViewModel? Delete()
{
if (!GetFullList().Any())
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Driver>.Filter;
var filter = filterBuilder.Empty;
var element = context.Drivers.FindOneAndDelete(filter);
return element.GetViewModel;
}
/// <summary>
/// Удаление всех элементов
/// </summary>
/// <returns></returns>
public int Clear()
{
using var context = new RouteGuideDatabase();
int count = GetFullList().Count;
if (count <= 0)
{
return 0;
}
var filterBuilder = Builders<Driver>.Filter;
var filter = filterBuilder.Empty;
context.Drivers.DeleteMany(filter);
return count;
}
}
}

222
RouteGuide/RouteGuideMongoDBImplement/Implements/RouteStorage.cs
View File

@ -1,222 +0,0 @@
using MongoDB.Driver;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.SearchModels;
using RouteGuideContracts.StoragesContracts;
using RouteGuideContracts.ViewModels;
using RouteGuideMongoDBImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RouteGuideMongoDBImplement.Implements
{
/// <summary>
/// Хранилище для сущности "Маршрут"
/// </summary>
public class RouteStorage : IRouteStorage
{
/// <summary>
/// Получение полного списка
/// </summary>
/// <returns></returns>
public List<RouteViewModel> GetFullList()
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Route>.Filter;
var filter = filterBuilder.Empty;
return context.Routes
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение фильтрованного списка
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<RouteViewModel> GetFilteredList(RouteSearchModel model)
{
if (string.IsNullOrEmpty(model.Name))
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Route>.Filter;
var filter = filterBuilder.Eq(x => x.Name, model.Name);
return context.Routes
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получить список из заданного количества элементов
/// </summary>
/// <param name="count"></param>
/// <returns></returns>
public List<RouteViewModel> GetList(int count)
{
if (count <= 0)
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Route>.Filter;
var filter = filterBuilder.Empty;
return context.Routes
.Find(filter)
.Limit(count)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public RouteViewModel? GetElement(RouteSearchModel model)
{
if (string.IsNullOrEmpty(model.Id?.ToString()) && string.IsNullOrEmpty(model.Name))
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Route>.Filter;
var filter = filterBuilder.Empty;
if (!string.IsNullOrEmpty(model.Name))
{
filter &= filterBuilder.Eq(x => x.Name, model.Name);
}
if (!string.IsNullOrEmpty(model.Id?.ToString()))
{
filter &= filterBuilder.Eq(x => x.Id, model.Id);
}
return context.Routes
.Find(filter)
.FirstOrDefault()
?.GetViewModel;
}
/// <summary>
/// Добавление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public RouteViewModel? Insert(RouteBindingModel model)
{
using var context = new RouteGuideDatabase();
var newRoute = Route.Create(context, model);
if (newRoute == null)
{
return null;
}
context.Routes.InsertOne(newRoute);
return newRoute.GetViewModel;
}
/// <summary>
/// Редактирование элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public RouteViewModel? Update(RouteBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Route>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id.ToString());
var route = context.Routes.Find(filter).FirstOrDefault();
if (route == null)
{
return null;
}
route.Update(model);
route.UpdateStops(context, model);
context.Routes.ReplaceOne(filter, route);
return route.GetViewModel;
}
/// <summary>
/// Удаление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public RouteViewModel? Delete(RouteBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Route>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var route = context.Routes.Find(filter).FirstOrDefault();
if (route == null)
{
return null;
}
context.Routes.FindOneAndDelete(filter);
return route.GetViewModel;
}
/// <summary>
/// Удаление записи
/// </summary>
/// <returns></returns>
public RouteViewModel? Delete()
{
if (!GetFullList().Any())
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Route>.Filter;
var filter = filterBuilder.Empty;
var element = context.Routes.FindOneAndDelete(filter);
return element.GetViewModel;
}
/// <summary>
/// Удаление всех элементов
/// </summary>
/// <returns></returns>
public int Clear()
{
using var context = new RouteGuideDatabase();
int count = GetFullList().Count;
if (count <= 0)
{
return 0;
}
var filterBuilder = Builders<Route>.Filter;
var filter = filterBuilder.Empty;
context.Routes.DeleteMany(filter);
return count;
}
}
}

213
RouteGuide/RouteGuideMongoDBImplement/Implements/ScheduleStorage.cs
View File

@ -1,213 +0,0 @@
using MongoDB.Driver;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.SearchModels;
using RouteGuideContracts.StoragesContracts;
using RouteGuideContracts.ViewModels;
using RouteGuideMongoDBImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RouteGuideMongoDBImplement.Implements
{
/// <summary>
/// Хранилище для сущности "Расписание"
/// </summary>
public class ScheduleStorage : IScheduleStorage
{
/// <summary>
/// Получение полного списка
/// </summary>
/// <returns></returns>
public List<ScheduleViewModel> GetFullList()
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Schedule>.Filter;
var filter = filterBuilder.Empty;
return context.Schedules
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение фильтрованного списка
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<ScheduleViewModel> GetFilteredList(ScheduleSearchModel model)
{
if (string.IsNullOrEmpty(model.Id?.ToString()))
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Schedule>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
return context.Schedules
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получить список из заданного количества элементов
/// </summary>
/// <param name="count"></param>
/// <returns></returns>
public List<ScheduleViewModel> GetList(int count)
{
if (count <= 0)
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Schedule>.Filter;
var filter = filterBuilder.Empty;
return context.Schedules
.Find(filter)
.Limit(count)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public ScheduleViewModel? GetElement(ScheduleSearchModel model)
{
if (string.IsNullOrEmpty(model.Id?.ToString()))
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Schedule>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
return context.Schedules
.Find(filter)
.FirstOrDefault()
?.GetViewModel;
}
/// <summary>
/// Добавление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public ScheduleViewModel? Insert(ScheduleBindingModel model)
{
using var context = new RouteGuideDatabase();
var newSchedule = Schedule.Create(context, model);
if (newSchedule == null)
{
return null;
}
context.Schedules.InsertOne(newSchedule);
return newSchedule.GetViewModel;
}
/// <summary>
/// Редактирование элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public ScheduleViewModel? Update(ScheduleBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Schedule>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var schedule = context.Schedules.Find(filter).FirstOrDefault();
if (schedule == null)
{
return null;
}
schedule.Update(model);
context.Schedules.ReplaceOne(filter, schedule);
return schedule.GetViewModel;
}
/// <summary>
/// Удаление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public ScheduleViewModel? Delete(ScheduleBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Schedule>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var schedule = context.Schedules.Find(filter).FirstOrDefault();
if (schedule == null)
{
return null;
}
context.Schedules.FindOneAndDelete(filter);
return schedule.GetViewModel;
}
/// <summary>
/// Удаление записи
/// </summary>
/// <returns></returns>
public ScheduleViewModel? Delete()
{
if (!GetFullList().Any())
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Schedule>.Filter;
var filter = filterBuilder.Empty;
var element = context.Schedules.FindOneAndDelete(filter);
return element.GetViewModel;
}
/// <summary>
/// Удаление всех элементов
/// </summary>
/// <returns></returns>
public int Clear()
{
using var context = new RouteGuideDatabase();
int count = GetFullList().Count;
if (count <= 0)
{
return 0;
}
var filterBuilder = Builders<Schedule>.Filter;
var filter = filterBuilder.Empty;
context.Schedules.DeleteMany(filter);
return count;
}
}
}

221
RouteGuide/RouteGuideMongoDBImplement/Implements/StopStorage.cs
View File

@ -1,221 +0,0 @@
using MongoDB.Driver;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.SearchModels;
using RouteGuideContracts.StoragesContracts;
using RouteGuideContracts.ViewModels;
using RouteGuideMongoDBImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RouteGuideMongoDBImplement.Implements
{
/// <summary>
/// Хранилище для сущности "Остановка"
/// </summary>
public class StopStorage : IStopStorage
{
/// <summary>
/// Получение полного списка
/// </summary>
/// <returns></returns>
public List<StopViewModel> GetFullList()
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Stop>.Filter;
var filter = filterBuilder.Empty;
return context.Stops
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение фильтрованного списка
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<StopViewModel> GetFilteredList(StopSearchModel model)
{
if (string.IsNullOrEmpty(model.Name))
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Stop>.Filter;
var filter = filterBuilder.Eq(x => x.Name, model.Name);
return context.Stops
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получить список из заданного количества элементов
/// </summary>
/// <param name="count"></param>
/// <returns></returns>
public List<StopViewModel> GetList(int count)
{
if (count <= 0)
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Stop>.Filter;
var filter = filterBuilder.Empty;
return context.Stops
.Find(filter)
.Limit(count)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public StopViewModel? GetElement(StopSearchModel model)
{
if (string.IsNullOrEmpty(model.Id?.ToString()) && string.IsNullOrEmpty(model.Name))
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Stop>.Filter;
var filter = filterBuilder.Empty;
if (!string.IsNullOrEmpty(model.Name))
{
filter &= filterBuilder.Eq(x => x.Name, model.Name);
}
if (!string.IsNullOrEmpty(model.Id?.ToString()))
{
filter &= filterBuilder.Eq(x => x.Id, model.Id);
}
return context.Stops
.Find(filter)
.FirstOrDefault()
?.GetViewModel;
}
/// <summary>
/// Добавление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public StopViewModel? Insert(StopBindingModel model)
{
var newStop = Stop.Create(model);
if (newStop == null)
{
return null;
}
using var context = new RouteGuideDatabase();
context.Stops.InsertOne(newStop);
return newStop.GetViewModel;
}
/// <summary>
/// Редактирование элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public StopViewModel? Update(StopBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Stop>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var stop = context.Stops.Find(filter).FirstOrDefault();
if (stop == null)
{
return null;
}
stop.Update(model);
context.Stops.ReplaceOne(filter, stop);
return stop.GetViewModel;
}
/// <summary>
/// Удаление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public StopViewModel? Delete(StopBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Stop>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var stop = context.Stops.Find(filter).FirstOrDefault();
if (stop == null)
{
return null;
}
context.Stops.FindOneAndDelete(filter);
return stop.GetViewModel;
}
/// <summary>
/// Удаление записи
/// </summary>
/// <returns></returns>
public StopViewModel? Delete()
{
if (!GetFullList().Any())
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Stop>.Filter;
var filter = filterBuilder.Empty;
var element = context.Stops.FindOneAndDelete(filter);
return element.GetViewModel;
}
/// <summary>
/// Удаление всех элементов
/// </summary>
/// <returns></returns>
public int Clear()
{
using var context = new RouteGuideDatabase();
int count = GetFullList().Count;
if (count <= 0)
{
return 0;
}
var filterBuilder = Builders<Stop>.Filter;
var filter = filterBuilder.Empty;
context.Stops.DeleteMany(filter);
return count;
}
}
}

221
RouteGuide/RouteGuideMongoDBImplement/Implements/TransportStorage.cs
View File

@ -1,221 +0,0 @@
using MongoDB.Driver;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.SearchModels;
using RouteGuideContracts.StoragesContracts;
using RouteGuideContracts.ViewModels;
using RouteGuideMongoDBImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RouteGuideMongoDBImplement.Implements
{
/// <summary>
/// Хранилище для сущности "Транспорт"
/// </summary>
public class TransportStorage : ITransportStorage
{
/// <summary>
/// Получение полного списка
/// </summary>
/// <returns></returns>
public List<TransportViewModel> GetFullList()
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Transport>.Filter;
var filter = filterBuilder.Empty;
return context.Transport
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение фильтрованного списка
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<TransportViewModel> GetFilteredList(TransportSearchModel model)
{
if (string.IsNullOrEmpty(model.License))
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Transport>.Filter;
var filter = filterBuilder.Eq(x => x.License, model.License);
return context.Transport
.Find(filter)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получить список из заданного количества элементов
/// </summary>
/// <param name="count"></param>
/// <returns></returns>
public List<TransportViewModel> GetList(int count)
{
if (count <= 0)
{
return new();
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Transport>.Filter;
var filter = filterBuilder.Empty;
return context.Transport
.Find(filter)
.Limit(count)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
/// <summary>
/// Получение элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public TransportViewModel? GetElement(TransportSearchModel model)
{
if (string.IsNullOrEmpty(model.Id?.ToString()) && string.IsNullOrEmpty(model.License))
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Transport>.Filter;
var filter = filterBuilder.Empty;
if (!string.IsNullOrEmpty(model.License))
{
filter &= filterBuilder.Eq(x => x.License, model.License);
}
if (!string.IsNullOrEmpty(model.Id?.ToString()))
{
filter &= filterBuilder.Eq(x => x.Id, model.Id);
}
return context.Transport
.Find(filter)
.FirstOrDefault()
?.GetViewModel;
}
/// <summary>
/// Добавление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public TransportViewModel? Insert(TransportBindingModel model)
{
using var context = new RouteGuideDatabase();
var newTransport = Transport.Create(context, model);
if (newTransport == null)
{
return null;
}
context.Transport.InsertOne(newTransport);
return newTransport.GetViewModel;
}
/// <summary>
/// Редактирование элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public TransportViewModel? Update(TransportBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Transport>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var transport = context.Transport.Find(filter).FirstOrDefault();
if (transport == null)
{
return null;
}
transport.Update(model);
context.Transport.ReplaceOne(filter, transport);
return transport.GetViewModel;
}
/// <summary>
/// Удаление элемента
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public TransportViewModel? Delete(TransportBindingModel model)
{
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Transport>.Filter;
var filter = filterBuilder.Eq(x => x.Id, model.Id);
var transport = context.Transport.Find(filter).FirstOrDefault();
if (transport == null)
{
return null;
}
context.Transport.FindOneAndDelete(filter);
return transport.GetViewModel;
}
/// <summary>
/// Удаление записи
/// </summary>
/// <returns></returns>
public TransportViewModel? Delete()
{
if (!GetFullList().Any())
{
return null;
}
using var context = new RouteGuideDatabase();
var filterBuilder = Builders<Transport>.Filter;
var filter = filterBuilder.Empty;
var element = context.Transport.FindOneAndDelete(filter);
return element.GetViewModel;
}
/// <summary>
/// Удаление всех элементов
/// </summary>
/// <returns></returns>
public int Clear()
{
using var context = new RouteGuideDatabase();
int count = GetFullList().Count;
if (count <= 0)
{
return 0;
}
var filterBuilder = Builders<Transport>.Filter;
var filter = filterBuilder.Empty;
context.Transport.DeleteMany(filter);
return count;
}
}
}

113
RouteGuide/RouteGuideMongoDBImplement/Models/Driver.cs
View File

@ -1,113 +0,0 @@
using MongoDB.Bson.Serialization.Attributes;
using MongoDB.Bson;
using RouteGuideDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.ViewModels;
namespace RouteGuideMongoDBImplement.Models
{
/// <summary>
/// Сущность "Водитель"
/// </summary>
public class Driver : IDriverModel<string>
{
/// <summary>
/// Идентификатор
/// </summary>
[BsonId]
[BsonElement("_id")]
[BsonRepresentation(BsonType.ObjectId)]
public string? Id { get; private set; }
/// <summary>
/// ФИО водителя
/// </summary>
[BsonRequired]
public string FullName { get; private set; } = string.Empty;
/// <summary>
/// Номер телефона водителя
/// </summary>
[BsonRequired]
public string Phone { get; private set; } = string.Empty;
/// <summary>
/// Опыт работы водителя
/// </summary>
[BsonIgnoreIfNull]
[BsonIgnoreIfDefault]
public int? Experience { get; private set; }
/// <summary>
/// Создание модели
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static Driver? Create(DriverBindingModel model)
{
if (model == null)
{
return null;
}
return new Driver()
{
FullName = model.FullName,
Phone = model.Phone,
Experience = model.Experience
};
}
/// <summary>
/// Создание модели
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static Driver? Create(DriverViewModel model)
{
if (model == null)
{
return null;
}
return new Driver()
{
FullName = model.FullName,
Phone = model.Phone,
Experience = model.Experience
};
}
/// <summary>
/// Изменение модели
/// </summary>
/// <param name="model"></param>
public void Update(DriverBindingModel model)
{
if (model == null)
{
return;
}
FullName = model.FullName;
Phone = model.Phone;
Experience = model.Experience;
}
/// <summary>
/// Получение модели
/// </summary>
public DriverViewModel GetViewModel => new()
{
Id = Id!,
FullName = FullName,
Phone = Phone,
Experience = Experience
};
}
}

150
RouteGuide/RouteGuideMongoDBImplement/Models/Route.cs
View File

@ -1,150 +0,0 @@
using MongoDB.Bson.Serialization.Attributes;
using MongoDB.Bson;
using RouteGuideDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.ViewModels;
using MongoDB.Driver;
namespace RouteGuideMongoDBImplement.Models
{
/// <summary>
/// Сущность "Маршрут"
/// </summary>
public class Route : IRouteModel<string>
{
/// <summary>
/// Идентификатор
/// </summary>
[BsonId]
[BsonElement("_id")]
[BsonRepresentation(BsonType.ObjectId)]
public string? Id { get; private set; }
/// <summary>
/// Название маршрута
/// </summary>
[BsonRequired]
public string Name { get; private set; } = string.Empty;
/// <summary>
/// Идентификатор транспорта
/// </summary>
[BsonRequired]
[BsonElement("TransportId")]
public string? TransportId { get; private set; }
/// <summary>
/// Сущность "Транспорт"
/// </summary>
[BsonIgnoreIfNull]
[BsonIgnoreIfDefault]
public virtual Transport Transport { get; private set; } = new();
/// <summary>
/// Коллекция остановок маршрута
/// </summary>
[BsonElement("Stops")]
public Dictionary<string, (Stop Stop, int Number)>? Stops = new();
/// <summary>
/// Коллекция остановок маршрута
/// </summary>
[BsonIgnore]
private Dictionary<string, (IStopModel<string>, int)>? _routeStops = null;
/// <summary>
/// Коллекция остановок маршрута
/// </summary>
[BsonIgnore]
public Dictionary<string, (IStopModel<string>, int)>? RouteStops
{
get
{
if (_routeStops == null)
{
_routeStops = Stops?
.ToDictionary(recRS => recRS.Key, recRS => (recRS.Value.Stop as IStopModel<string>, recRS.Value.Number));
}
return _routeStops;
}
}
/// <summary>
/// Созданме модели
/// </summary>
/// <param name="context"></param>
/// <param name="model"></param>
/// <returns></returns>
public static Route Create(RouteGuideDatabase context, RouteBindingModel model)
{
return new Route()
{
Name = model.Name,
TransportId = model.TransportId.ToString(),
Transport = context.Transport
.Find(Builders<Transport>.Filter.Eq(x => x.Id, model.TransportId))
.FirstOrDefault(),
Stops = model.RouteStops.ToDictionary(
x => x.Key.ToString()!,
x => (context.Stops
.Find(Builders<Stop>.Filter.Eq(y => y.Id, x.Key))
.FirstOrDefault(),
x.Value.Item2))
};
}
/// <summary>
/// Изменение модели
/// </summary>
/// <param name="model"></param>
public void Update(RouteBindingModel model)
{
if (model == null)
{
return;
}
Name = model.Name;
}
/// <summary>
/// Получение модели
/// </summary>
public RouteViewModel GetViewModel => new()
{
Id = Id!,
Name = Name,
TransportId = TransportId!,
RouteStops = RouteStops?
.ToDictionary(recRS => (object)recRS.Key, recRS => (new StopViewModel()
{
Id = (object)recRS.Value.Item1.Id!,
Name = recRS.Value.Item1.Name,
Street = recRS.Value.Item1.Street,
Number = recRS.Value.Item1.Number
} as IStopModel<object>, recRS.Value.Item2)) ?? new(),
TransportLicense = Transport.License
};
/// <summary>
/// Обновление списка связей
/// </summary>
/// <param name="context"></param>
/// <param name="model"></param>
public void UpdateStops(RouteGuideDatabase context, RouteBindingModel model)
{
Stops = model.RouteStops.ToDictionary(
x => x.Key.ToString()!,
x => (context.Stops
.Find(Builders<Stop>.Filter.Eq(y => y.Id, x.Key))
.FirstOrDefault(),
x.Value.Item2));
_routeStops = null;
}
}
}

122
RouteGuide/RouteGuideMongoDBImplement/Models/Schedule.cs
View File

@ -1,122 +0,0 @@
using MongoDB.Bson.Serialization.Attributes;
using MongoDB.Bson;
using RouteGuideDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.ViewModels;
using MongoDB.Driver;
namespace RouteGuideMongoDBImplement.Models
{
/// <summary>
/// Сущность "Расписание"
/// </summary>
public class Schedule : IScheduleModel<string>
{
/// <summary>
/// Идентификатор
/// </summary>
[BsonId]
[BsonElement("_id")]
[BsonRepresentation(BsonType.ObjectId)]
public string? Id { get; private set; }
/// <summary>
/// Дата записи расписания
/// </summary>
[BsonRequired]
public DateTime Date { get; private set; } = DateTime.Now;
/// <summary>
/// Время отправления
/// </summary>
[BsonRequired]
public DateTime DepartureTime { get; private set; } = DateTime.MinValue;
/// <summary>
/// Время прибытия
/// </summary>
[BsonRequired]
public DateTime ArrivalTime { get; private set; } = DateTime.MinValue;
/// <summary>
/// Периодичность движения транспорта
/// </summary>
[BsonRequired]
public DateTime Frequency { get; private set; } = DateTime.MinValue;
/// <summary>
/// Идентификатор маршрута
/// </summary>
[BsonRequired]
[BsonElement("RouteId")]
public string? RouteId { get; private set; }
/// <summary>
/// Сущность "Маршрут"
/// </summary>
[BsonIgnoreIfNull]
[BsonIgnoreIfDefault]
public virtual Route Route { get; private set; } = new();
/// <summary>
/// Создание модели
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static Schedule? Create(RouteGuideDatabase context, ScheduleBindingModel model)
{
if (model == null)
{
return null;
}
return new Schedule()
{
Date = model.Date,
DepartureTime = model.DepartureTime,
ArrivalTime = model.ArrivalTime,
Frequency = model.Frequency,
RouteId = model.RouteId.ToString(),
Route = context.Routes
.Find(Builders<Route>.Filter.Eq(x => x.Id, model.RouteId))
.FirstOrDefault()
};
}
/// <summary>
/// Изменение модели
/// </summary>
/// <param name="model"></param>
public void Update(ScheduleBindingModel model)
{
if (model == null)
{
return;
}
Date = model.Date;
DepartureTime = model.DepartureTime;
ArrivalTime = model.ArrivalTime;
Frequency = model.Frequency;
}
/// <summary>
/// Получение модели
/// </summary>
public ScheduleViewModel GetViewModel => new()
{
Id = Id!,
Date = Date,
DepartureTime = DepartureTime,
ArrivalTime = ArrivalTime,
Frequency = Frequency,
RouteId = RouteId!,
RouteName = Route.Name
};
}
}

112
RouteGuide/RouteGuideMongoDBImplement/Models/Stop.cs
View File

@ -1,112 +0,0 @@
using MongoDB.Bson.Serialization.Attributes;
using MongoDB.Bson;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.ViewModels;
using RouteGuideDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RouteGuideMongoDBImplement.Models
{
/// <summary>
/// Сущность "Остановка"
/// </summary>
public class Stop : IStopModel<string>
{
/// <summary>
/// Идентификатор
/// </summary>
[BsonId]
[BsonElement("_id")]
[BsonRepresentation(BsonType.ObjectId)]
public string? Id { get; private set; }
/// <summary>
/// Название остановки
/// </summary>
[BsonRequired]
public string Name { get; private set; } = string.Empty;
/// <summary>
/// Название улицы
/// </summary>
[BsonRequired]
public string Street { get; private set; } = string.Empty;
/// <summary>
/// Номер дома
/// </summary>
[BsonRequired]
public int Number { get; private set; }
/// <summary>
/// Создание модели
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static Stop? Create(StopBindingModel model)
{
if (model == null)
{
return null;
}
return new Stop()
{
Name = model.Name,
Street = model.Street,
Number = model.Number
};
}
/// <summary>
/// Создание модели
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static Stop? Create(StopViewModel model)
{
if (model == null)
{
return null;
}
return new Stop()
{
Name = model.Name,
Street = model.Street,
Number = model.Number
};
}
/// <summary>
/// Изменение модели
/// </summary>
/// <param name="model"></param>
public void Update(StopBindingModel model)
{
if (model == null)
{
return;
}
Name = model.Name;
Street = model.Street;
Number = model.Number;
}
/// <summary>
/// Получение модели
/// </summary>
public StopViewModel GetViewModel => new()
{
Id = Id!,
Name = Name,
Street = Street,
Number = Number
};
}
}

113
RouteGuide/RouteGuideMongoDBImplement/Models/Transport.cs
View File

@ -1,113 +0,0 @@
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.ViewModels;
using RouteGuideDataModels.Enums;
using RouteGuideDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using MongoDB.Bson.Serialization.Attributes;
using MongoDB.Bson;
using MongoDB.Driver;
namespace RouteGuideMongoDBImplement.Models
{
/// <summary>
/// Сущность "Транспорт"
/// </summary>
public class Transport : ITransportModel<string>
{
/// <summary>
/// Идентификатор
/// </summary>
[BsonId]
[BsonElement("_id")]
[BsonRepresentation(BsonType.ObjectId)]
public string? Id { get; private set; }
/// <summary>
/// Номерной знак
/// </summary>
[BsonRequired]
public string License { get; private set; } = string.Empty;
/// <summary>
/// Тип транспортного средства
/// </summary>
[BsonRequired]
public TransportType Type { get; private set; } = TransportType.Автобус;
/// <summary>
/// Вместимость (количество пассажиров)
/// </summary>
[BsonRequired]
public int Capacity { get; private set; }
/// <summary>
/// Идентификатор водителя
/// </summary>
[BsonRequired]
[BsonElement("DriverId")]
public string? DriverId { get; private set; }
/// <summary>
/// Сущность "Водитель"
/// </summary>
[BsonIgnoreIfNull]
[BsonIgnoreIfDefault]
public virtual Driver Driver { get; private set; } = new();
/// <summary>
/// Создание модели
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static Transport? Create(RouteGuideDatabase context, TransportBindingModel model)
{
if (model == null)
{
return null;
}
return new Transport()
{
License = model.License,
Type = model.Type,
Capacity = model.Capacity,
DriverId = model.DriverId.ToString(),
Driver = context.Drivers
.Find(Builders<Driver>.Filter.Eq(x => x.Id, model.DriverId))
.FirstOrDefault()
};
}
/// <summary>
/// Изменение модели
/// </summary>
/// <param name="model"></param>
public void Update(TransportBindingModel model)
{
if (model == null)
{
return;
}
License = model.License;
Capacity = model.Capacity;
}
/// <summary>
/// Получение модели
/// </summary>
public TransportViewModel GetViewModel => new()
{
Id = Id!,
License = License,
Type = Type,
Capacity = Capacity,
DriverId = DriverId!,
DriverName = Driver.FullName
};
}
}

68
RouteGuide/RouteGuideMongoDBImplement/RouteGuideDatabase.cs
View File

@ -1,68 +0,0 @@
using MongoDB.Driver;
using RouteGuideMongoDBImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RouteGuideMongoDBImplement
{
/// <summary>
/// Класс для взаимодействия с базой данных
/// </summary>
public class RouteGuideDatabase : IDisposable
{
/// <summary>
/// Клиент
/// </summary>
public readonly MongoClient _client;
/// <summary>
/// База данных
/// </summary>
private readonly IMongoDatabase _database;
/// <summary>
/// Конструктор
/// </summary>
/// <param name="connectionString">Параметры подключения к базе данных</param>
/// <param name="databaseName">Название базы данных</param>
public RouteGuideDatabase(string connectionString = "mongodb://localhost:27017",
string databaseName = "RouteGuideDatabase")
{
_client = new MongoClient(connectionString);
_database = _client.GetDatabase(databaseName);
}
/// <summary>
/// Коллекция "Водители"
/// </summary>
public IMongoCollection<Driver> Drivers => _database.GetCollection<Driver>("Drivers");
/// <summary>
/// Коллекция "Транспорт"
/// </summary>
public IMongoCollection<Transport> Transport => _database.GetCollection<Transport>("Transport");
/// <summary>
/// Коллекция "Маршруты"
/// </summary>
public IMongoCollection<Route> Routes => _database.GetCollection<Route>("Routes");
/// <summary>
/// Коллекция "Остановки"
/// </summary>
public IMongoCollection<Stop> Stops => _database.GetCollection<Stop>("Stops");
/// <summary>
/// Коллекция "Расписания"
/// </summary>
public IMongoCollection<Schedule> Schedules => _database.GetCollection<Schedule>("Schedules");
/// <summary>
/// Освободить ресурсы
/// </summary>
public void Dispose() { }
}
}

20
RouteGuide/RouteGuideMongoDBImplement/RouteGuideMongoDBImplement.csproj
View File

@ -1,20 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\RouteGuideContracts\RouteGuideContracts.csproj" />
<ProjectReference Include="..\RouteGuideDataModels\RouteGuideDataModels.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MongoDB.Bson" Version="2.25.0" />
<PackageReference Include="MongoDB.Driver" Version="2.25.0" />
<PackageReference Include="Npgsql" Version="7.0.4" />
</ItemGroup>
</Project>

12
RouteGuide/RouteGuideView/FormDriver.cs
View File

@ -31,12 +31,12 @@ namespace RouteGuideView
/// <summary>
/// Идентификатор
/// </summary>
private object? _id;
private int? _id;
/// <summary>
/// Идентификатор
/// </summary>
public object Id { set { _id = value; } }
public int Id { set { _id = value; } }
/// <summary>
/// Конструктор
@ -55,7 +55,7 @@ namespace RouteGuideView
/// <param name="e"></param>
private void FormDriver_Load(object sender, EventArgs e)
{
if (_id == null)
if (!_id.HasValue)
{
return;
}
@ -65,7 +65,7 @@ namespace RouteGuideView
_logger.LogInformation("Получение сущности 'Водитель'");
var view = _driverLogic.ReadElement(new DriverSearchModel
{
Id = _id
Id = _id.Value
});
if (view != null)
{
@ -104,13 +104,13 @@ namespace RouteGuideView
{
var model = new DriverBindingModel
{
Id = _id,
Id = _id ?? 0,
FullName = textBoxFullName.Text,
Phone = textBoxPhone.Text,
Experience = int.TryParse(textBoxExperience.Text, out int experience) ? experience : 0
};
var operationResult = _id != null ? _driverLogic.Update(model) : _driverLogic.Create(model);
var operationResult = _id.HasValue ? _driverLogic.Update(model) : _driverLogic.Create(model);
if (!operationResult)
{
throw new Exception("Ошибка при сохранении сущности 'Водитель'. Дополнительная информация в логах.");

4
RouteGuide/RouteGuideView/FormDrivers.cs
View File

@ -75,7 +75,7 @@ namespace RouteGuideView
var service = Program.ServiceProvider?.GetService(typeof(FormDriver));
if (service is FormDriver form)
{
form.Id = dataGridView.SelectedRows[0].Cells["Id"].Value;
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
@ -95,7 +95,7 @@ namespace RouteGuideView
{
if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
object id = dataGridView.SelectedRows[0].Cells["Id"].Value;
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Удаление сущности 'Водитель'");
try

23
RouteGuide/RouteGuideView/FormMain.Designer.cs generated
View File

@ -45,7 +45,6 @@
buttonDelete = new Button();
buttonRefresh = new Button();
dataGridView = new DataGridView();
buttonSyncData = new Button();
menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
@ -104,35 +103,35 @@
// DriversTestsToolStripMenuItem
//
DriversTestsToolStripMenuItem.Name = "DriversTestsToolStripMenuItem";
DriversTestsToolStripMenuItem.Size = new Size(139, 22);
DriversTestsToolStripMenuItem.Size = new Size(180, 22);
DriversTestsToolStripMenuItem.Text = "Водители";
DriversTestsToolStripMenuItem.Click += DriversTestsToolStripMenuItem_Click;
//
// TransportTestsToolStripMenuItem
//
TransportTestsToolStripMenuItem.Name = "TransportTestsToolStripMenuItem";
TransportTestsToolStripMenuItem.Size = new Size(139, 22);
TransportTestsToolStripMenuItem.Size = new Size(180, 22);
TransportTestsToolStripMenuItem.Text = "Транспорт";
TransportTestsToolStripMenuItem.Click += TransportTestsToolStripMenuItem_Click;
//
// RoutesTestsToolStripMenuItem
//
RoutesTestsToolStripMenuItem.Name = "RoutesTestsToolStripMenuItem";
RoutesTestsToolStripMenuItem.Size = new Size(139, 22);
RoutesTestsToolStripMenuItem.Size = new Size(180, 22);
RoutesTestsToolStripMenuItem.Text = "Маршруты";
RoutesTestsToolStripMenuItem.Click += RoutesTestsToolStripMenuItem_Click;
//
// StopsTestsToolStripMenuItem
//
StopsTestsToolStripMenuItem.Name = "StopsTestsToolStripMenuItem";
StopsTestsToolStripMenuItem.Size = new Size(139, 22);
StopsTestsToolStripMenuItem.Size = new Size(180, 22);
StopsTestsToolStripMenuItem.Text = "Остановки";
StopsTestsToolStripMenuItem.Click += StopsTestsToolStripMenuItem_Click;
//
// SchedulesTestsToolStripMenuItem
//
SchedulesTestsToolStripMenuItem.Name = "SchedulesTestsToolStripMenuItem";
SchedulesTestsToolStripMenuItem.Size = new Size(139, 22);
SchedulesTestsToolStripMenuItem.Size = new Size(180, 22);
SchedulesTestsToolStripMenuItem.Text = "Расписания";
SchedulesTestsToolStripMenuItem.Click += SchedulesTestsToolStripMenuItem_Click;
//
@ -193,22 +192,11 @@
dataGridView.Size = new Size(850, 337);
dataGridView.TabIndex = 5;
//
// buttonSyncData
//
buttonSyncData.Location = new Point(885, 309);
buttonSyncData.Name = "buttonSyncData";
buttonSyncData.Size = new Size(75, 40);
buttonSyncData.TabIndex = 6;
buttonSyncData.Text = "Синхр. данные";
buttonSyncData.UseVisualStyleBackColor = true;
buttonSyncData.Click += buttonSyncData_Click;
//
// FormMain
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(984, 361);
Controls.Add(buttonSyncData);
Controls.Add(dataGridView);
Controls.Add(buttonRefresh);
Controls.Add(buttonDelete);
@ -245,6 +233,5 @@
private ToolStripMenuItem RoutesTestsToolStripMenuItem;
private ToolStripMenuItem StopsTestsToolStripMenuItem;
private ToolStripMenuItem SchedulesTestsToolStripMenuItem;
private Button buttonSyncData;
}
}

16
RouteGuide/RouteGuideView/FormMain.cs
View File

@ -2,7 +2,6 @@ using Microsoft.Extensions.Logging;
using RouteGuideBusinessLogics.BusinessLogics;
using RouteGuideContracts.BindingModels;
using RouteGuideContracts.BusinessLogicsContracts;
using RouteGuideMongoDBImplement;
namespace RouteGuideView
{
@ -198,7 +197,7 @@ namespace RouteGuideView
var service = Program.ServiceProvider?.GetService(typeof(FormSchedule));
if (service is FormSchedule form)
{
form.Id = dataGridView.SelectedRows[0].Cells["Id"].Value;
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
@ -218,7 +217,7 @@ namespace RouteGuideView
{
if (MessageBox.Show("Óäàëèòü çàïèñü?", "Âîïðîñ", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
object id = dataGridView.SelectedRows[0].Cells["Id"].Value;
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Óäàëåíèå ñóùíîñòè 'Ðàñïèñàíèå'");
try
@ -248,17 +247,6 @@ namespace RouteGuideView
LoadData();
}
/// <summary>
/// Êíîïêà "Ñèíõðîíèçèðîâàòü äàííûå"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonSyncData_Click(object sender, EventArgs e)
{
DataTransfer dataTransfer = new DataTransfer();
dataTransfer.SyncData();
}
/// <summary>
/// Çàãðóçêà äàííûõ
/// </summary>

22
RouteGuide/RouteGuideView/FormRoute.cs
View File

@ -39,17 +39,17 @@ namespace RouteGuideView
/// <summary>
/// Идентификатор
/// </summary>
private object? _id;
private int? _id;
/// <summary>
/// Идентификатор
/// </summary>
public object Id { set { _id = value; } }
public int Id { set { _id = value; } }
/// <summary>
/// Список остановок в маршруте
/// </summary>
private Dictionary<object, (IStopModel<object>, int)> _routeStops;
private Dictionary<int, (IStopModel, int)> _routeStops;
/// <summary>
/// Конструктор
@ -62,7 +62,7 @@ namespace RouteGuideView
_logger = logger;
_routeLogic = routeLogic;
_transportLogic = transportLogic;
_routeStops = new Dictionary<object, (IStopModel<object>, int)>();
_routeStops = new Dictionary<int, (IStopModel, int)>();
}
/// <summary>
@ -91,7 +91,7 @@ namespace RouteGuideView
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
if (_id == null)
if (!_id.HasValue)
{
return;
}
@ -101,13 +101,13 @@ namespace RouteGuideView
_logger.LogInformation("Получение сущности 'Маршрут'");
var view = _routeLogic.ReadElement(new RouteSearchModel
{
Id = _id
Id = _id.Value
});
if (view != null)
{
textBoxName.Text = view.Name;
comboBoxTransport.SelectedValue = view.TransportId;
_routeStops = view.RouteStops ?? new Dictionary<object, (IStopModel<object>, int)>();
_routeStops = view.RouteStops ?? new Dictionary<int, (IStopModel, int)>();
LoadData();
}
}
@ -161,7 +161,7 @@ namespace RouteGuideView
var service = Program.ServiceProvider?.GetService(typeof(FormRouteStop));
if (service is FormRouteStop form)
{
object id = dataGridView.SelectedRows[0].Cells[0].Value;
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
form.Id = id;
form.Number = _routeStops[id].Item2;
@ -194,7 +194,7 @@ namespace RouteGuideView
try
{
_logger.LogInformation("Удаление остановки.{Id}: {StopName} с позиции в маршруте {Number}", dataGridView.SelectedRows[0].Cells[0].Value, dataGridView.SelectedRows[0].Cells[1].Value, dataGridView.SelectedRows[0].Cells[2].Value);
_routeStops.Remove(dataGridView.SelectedRows[0].Cells[0].Value);
_routeStops.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value));
}
catch (Exception ex)
{
@ -241,11 +241,11 @@ namespace RouteGuideView
{
Id = _id ?? 0,
Name = textBoxName.Text,
TransportId = comboBoxTransport.SelectedValue,
TransportId = Convert.ToInt32(comboBoxTransport.SelectedValue),
RouteStops = _routeStops
};
var operationResult = _id != null ? _routeLogic.Update(model) : _routeLogic.Create(model);
var operationResult = _id.HasValue ? _routeLogic.Update(model) : _routeLogic.Create(model);
if (!operationResult)
{
throw new Exception("Ошибка при сохранении сущности 'Маршрут'. Дополнительная информация в логах.");

6
RouteGuide/RouteGuideView/FormRouteStop.cs
View File

@ -26,11 +26,11 @@ namespace RouteGuideView
/// <summary>
/// Идентификатор остановки
/// </summary>
public object Id
public int Id
{
get
{
return comboBoxStop.SelectedValue;
return Convert.ToInt32(comboBoxStop.SelectedValue);
}
set
{
@ -41,7 +41,7 @@ namespace RouteGuideView
/// <summary>
/// Сущность "Остановка"
/// </summary>
public IStopModel<object>? StopModel
public IStopModel? StopModel
{
get
{

4
RouteGuide/RouteGuideView/FormRoutes.cs
View File

@ -78,7 +78,7 @@ namespace RouteGuideView
var service = Program.ServiceProvider?.GetService(typeof(FormRoute));
if (service is FormRoute form)
{
form.Id = dataGridView.SelectedRows[0].Cells["Id"].Value;
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
@ -98,7 +98,7 @@ namespace RouteGuideView
{
if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
object id = dataGridView.SelectedRows[0].Cells["Id"].Value;
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Удаление сущности 'Маршрут'");
try

2
RouteGuide/RouteGuideView/FormRoutesTests.cs
View File

@ -67,7 +67,7 @@ namespace RouteGuideView
{
double time = 0;
var stopwatch = new Stopwatch();
object transportId = _transportLogic.ReadList(1)![0].Id;
int transportId = _transportLogic.ReadList(1)![0].Id;
for (int i = 1; i <= entitiesCount; i++)
{
var model = new RouteBindingModel

12
RouteGuide/RouteGuideView/FormSchedule.cs
View File

@ -38,12 +38,12 @@ namespace RouteGuideView
/// <summary>
/// Идентификатор
/// </summary>
private object? _id;
private int? _id;
/// <summary>
/// Идентификатор
/// </summary>
public object Id { set { _id = value; } }
public int Id { set { _id = value; } }
/// <summary>
/// Констурктор
@ -85,7 +85,7 @@ namespace RouteGuideView
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
if (_id == null)
if (!_id.HasValue)
{
return;
}
@ -96,7 +96,7 @@ namespace RouteGuideView
_logger.LogInformation("Получение сущности 'Расписание'");
var view = _scheduleLogic.ReadElement(new ScheduleSearchModel
{
Id = _id
Id = _id.Value
});
if (view != null)
{
@ -142,10 +142,10 @@ namespace RouteGuideView
DepartureTime = dateTimePickerDepartureTime.Value,
ArrivalTime = dateTimePickerArrivalTime.Value,
Frequency = dateTimePickerFrequency.Value,
RouteId = comboBoxRoute.SelectedValue
RouteId = Convert.ToInt32(comboBoxRoute.SelectedValue)
};
var operationResult = _id != null ? _scheduleLogic.Update(model) : _scheduleLogic.Create(model);
var operationResult = _id.HasValue ? _scheduleLogic.Update(model) : _scheduleLogic.Create(model);
if (!operationResult)
{
throw new Exception("Ошибка при сохранении сущности 'Расписание'. Дополнительная информация в логах.");

2
RouteGuide/RouteGuideView/FormSchedulesTests.cs
View File

@ -67,7 +67,7 @@ namespace RouteGuideView
{
double time = 0;
var stopwatch = new Stopwatch();
object routeId = _routeLogic.ReadList(1)![0].Id;
int routeId = _routeLogic.ReadList(1)![0].Id;
for (int i = 1; i <= entitiesCount; i++)
{
var model = new ScheduleBindingModel

10
RouteGuide/RouteGuideView/FormStop.cs
View File

@ -33,12 +33,12 @@ namespace RouteGuideView
/// <summary>
/// Идентификатор
/// </summary>
private object? _id;
private int? _id;
/// <summary>
/// Идентификатор
/// </summary>
public object Id { set { _id = value; } }
public int Id { set { _id = value; } }
/// <summary>
/// Конструктор
@ -57,7 +57,7 @@ namespace RouteGuideView
/// <param name="e"></param>
private void FormStop_Load(object sender, EventArgs e)
{
if (_id == null)
if (!_id.HasValue)
{
return;
}
@ -67,7 +67,7 @@ namespace RouteGuideView
_logger.LogInformation("Получение сущности 'Остановка'");
var view = _stopLogic.ReadElement(new StopSearchModel
{
Id = _id
Id = _id.Value
});
if (view != null)
{
@ -117,7 +117,7 @@ namespace RouteGuideView
Number = int.TryParse(textBoxNumber.Text, out int number) ? number : 1
};
var operationResult = _id != null ? _stopLogic.Update(model) : _stopLogic.Create(model);
var operationResult = _id.HasValue ? _stopLogic.Update(model) : _stopLogic.Create(model);
if (!operationResult)
{
throw new Exception("Ошибка при сохранении сущности 'Остановка'. Дополнительная информация в логах.");

4
RouteGuide/RouteGuideView/FormStops.cs
View File

@ -78,7 +78,7 @@ namespace RouteGuideView
var service = Program.ServiceProvider?.GetService(typeof(FormStop));
if (service is FormStop form)
{
form.Id = dataGridView.SelectedRows[0].Cells["Id"].Value;
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
@ -98,7 +98,7 @@ namespace RouteGuideView
{
if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
object id = dataGridView.SelectedRows[0].Cells["Id"].Value;
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Удаление сущности 'Остановка'");
try

12
RouteGuide/RouteGuideView/FormTransport.cs
View File

@ -39,12 +39,12 @@ namespace RouteGuideView
/// <summary>
/// Идентификатор
/// </summary>
private object? _id;
private int? _id;
/// <summary>
/// Идентификатор
/// </summary>
public object Id { set { _id = value; } }
public int Id { set { _id = value; } }
/// <summary>
/// Конструктор
@ -92,7 +92,7 @@ namespace RouteGuideView
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
if (_id == null)
if (!_id.HasValue)
{
return;
}
@ -103,7 +103,7 @@ namespace RouteGuideView
_logger.LogInformation("Получение сущности 'Транспорт'");
var view = _transportLogic.ReadElement(new TransportSearchModel
{
Id = _id
Id = _id.Value
});
if (view != null)
{
@ -157,10 +157,10 @@ namespace RouteGuideView
License = textBoxLicense.Text,
Type = (TransportType)comboBoxType.SelectedItem,
Capacity = int.TryParse(textBoxCapacity.Text, out var capacity) ? capacity : 1,
DriverId = comboBoxDriver.SelectedValue
DriverId = Convert.ToInt32(comboBoxDriver.SelectedValue)
};
var operationResult = _id != null ? _transportLogic.Update(model) : _transportLogic.Create(model);
var operationResult = _id.HasValue ? _transportLogic.Update(model) : _transportLogic.Create(model);
if (!operationResult)
{
throw new Exception("Ошибка при сохранении сущности 'Транспорт'. Дополнительная информация в логах.");

2
RouteGuide/RouteGuideView/FormTransportTests.cs
View File

@ -67,7 +67,7 @@ namespace RouteGuideView
{
double time = 0;
var stopwatch = new Stopwatch();
object driverId = _driverLogic.ReadList(1)![0].Id;
int driverId = _driverLogic.ReadList(1)![0].Id;
for (int i = 1; i <= entitiesCount; i++)
{
var model = new TransportBindingModel

4
RouteGuide/RouteGuideView/FormTransports.cs
View File

@ -78,7 +78,7 @@ namespace RouteGuideView
var service = Program.ServiceProvider?.GetService(typeof(FormTransport));
if (service is FormTransport form)
{
form.Id = dataGridView.SelectedRows[0].Cells["Id"].Value;
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
@ -98,7 +98,7 @@ namespace RouteGuideView
{
if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
object id = dataGridView.SelectedRows[0].Cells["Id"].Value;
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Удаление сущности 'Транспорт'");
try

2
RouteGuide/RouteGuideView/Program.cs
View File

@ -4,7 +4,7 @@ using NLog.Extensions.Logging;
using RouteGuideBusinessLogics.BusinessLogics;
using RouteGuideContracts.BusinessLogicsContracts;
using RouteGuideContracts.StoragesContracts;
using RouteGuideMongoDBImplement.Implements;
using RouteGuideDatabaseImplement.Implements;
namespace RouteGuideView
{

1
RouteGuide/RouteGuideView/RouteGuideView.csproj
View File

@ -32,7 +32,6 @@
<ProjectReference Include="..\RouteGuideBusinessLogics\RouteGuideBusinessLogics.csproj" />
<ProjectReference Include="..\RouteGuideContracts\RouteGuideContracts.csproj" />
<ProjectReference Include="..\RouteGuideDatabaseImplement\RouteGuideDatabaseImplement.csproj" />
<ProjectReference Include="..\RouteGuideMongoDBImplement\RouteGuideMongoDBImplement.csproj" />
</ItemGroup>
</Project>