ikswi/ISEbd-22_Paramonova_I.A._ProjectPassengerTransfers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

готовая 4

Browse Source
This commit is contained in:
ikswi 2024-12-23 12:15:32 +04:00
parent 1e98e1a719
commit 03f05c7dc2
17 changed files with 177 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Bus.cs
View File

@ -1,10 +1,15 @@
using ProjectPassengerTransfers.Entities.Enums;
using System.ComponentModel;
namespace ProjectPassengerTransfers.Entities;
public class Bus
{
public int Id { get; private set; }
[DisplayName("Модель")]
public BusModel BusModel { get; private set; }
[DisplayName("Количество мест")]
public int SeatCount { get; private set; }
public static Bus CreateEntity(int id, BusModel busModel, int
seatCount)

10
ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Passenger.cs
View File

@ -1,13 +1,23 @@

using ProjectPassengerTransfers.Entities.Enums;
using System.ComponentModel;
namespace ProjectPassengerTransfers.Entities;
public class Passenger
{
public int Id { get; private set; }
[DisplayName("Тип")]
public PassengerType PassengerType { get; private set; }
[DisplayName("Имя")]
public string Name { get; private set; } = string.Empty;
[DisplayName("Фамилия")]
public string Surname { get; private set; } = string.Empty;
public string FullName => $"{Surname} {Name}";
public static Passenger CreateEntity(int id, PassengerType passengerType, string name, string surname)
{
return new Passenger

9
ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Route.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -9,9 +10,17 @@ namespace ProjectPassengerTransfers.Entities;
public class Route
{
public int Id { get; private set; }
[DisplayName("Название")]
public string Name { get; private set; } = string.Empty;
[DisplayName("Город отправки")]
public string DepartureCity { get; private set; } = string.Empty;
[DisplayName("Город назначения")]
public string ArrivalCity { get; private set; } = string.Empty;
[DisplayName("Расстояние")]
public int Distance { get; private set; }
public static Route CreateEntity(int id, string Name, string departureCity,
string arrivalCity, int distance)

26
ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Ticket.cs
View File

@ -1,10 +1,23 @@
namespace ProjectPassengerTransfers.Entities;
using System.ComponentModel;
namespace ProjectPassengerTransfers.Entities;
public class Ticket
{
public int Id { get; private set; }
[DisplayName("Дата продажи")]
public DateTime SaleDate { get; private set; }
[DisplayName("Пассажир")]
public int Passenger_Id { get; private set; }
[DisplayName("Билеты")]
public string Tickets => TripTickets != null ?
string.Join(", ", TripTickets.Select(x => $"{x.TripName}: {x.Count}шт")) :
string.Empty;
[Browsable(false)]
public IEnumerable<TripTicket> TripTickets { get; private set; } = [];
public static Ticket CreateOperation(int id, int passenger_Id, IEnumerable<TripTicket> tripTickets)
{
@ -16,14 +29,11 @@ public class Ticket
TripTickets = tripTickets
};
}
public static Ticket CreateOperation(TempTripTickets tempTripTickets, IEnumerable<TripTicket> tripTickets)
public void SetTripTickets(IEnumerable<TripTicket> tripTickets)
{
return new Ticket
if (tripTickets != null && tripTickets.Any())
{
Id = tempTripTickets.Id,
SaleDate = tempTripTickets.SaleDate,
Passenger_Id = tempTripTickets.Passenger_Id,
TripTickets = tripTickets
};
TripTickets = tripTickets;
}
}
}

26
ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs
View File

@ -1,5 +1,7 @@
using System;
using ProjectPassengerTransfers.Entities.Enums;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -9,9 +11,29 @@ namespace ProjectPassengerTransfers.Entities;
public class Trip
{
public int Id { get; private set; }
public DateTime Departure { get; private set; }
[DisplayName("Дата отправки")]
public DateTime Departure { get; private set; }
[DisplayName("Дата прибытия")]
public DateTime Arrival { get; private set; }
[Browsable(false)]
public int BusModel { get; private set; }
[Browsable(false)]
public string BusCount { get; private set; } = string.Empty;
[DisplayName("Маршрут")]
public string RouteName { get; private set; } = string.Empty;
[DisplayName("Автобус")]
public string BusName => $"{(BusModel)BusModel} {BusCount}";
[Browsable(false)]
public int Route_Id { get; private set; }
[Browsable(false)]
public int Bus_Id { get; private set; }
public static Trip CreateOperation(int id, int route_Id, int bus_Id, DateTime departure, DateTime arrival)

2
ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/TripTicket.cs
View File

@ -10,7 +10,7 @@ public class TripTicket
{
public int Id { get; private set; }
public int Trip_Id { get; private set; }
public string TripName { get; private set; } = string.Empty;
public int Count { get; private set; }
public static TripTicket CreateElement(int id, int trip_Id, int count)
{

12
ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormBus.cs
View File

@ -1,15 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using ProjectPassengerTransfers.Entities;
using ProjectPassengerTransfers.Entities;
using ProjectPassengerTransfers.Entities.Enums;
using ProjectPassengerTransfers.Repositories;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ProjectPassengerTransfers.Forms
{

6
ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormBuses.cs
View File

@ -87,7 +87,11 @@ namespace ProjectPassengerTransfers.Forms
}
}
private void LoadList() => dataGridView.DataSource = _busRepository.ReadBuses();
private void LoadList()
{
dataGridView.DataSource = _busRepository.ReadBuses();
dataGridView.Columns["Id"].Visible = false;
}
private bool TryGetIdentifierFromSelectedRow(out int id)
{

6
ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormPassengers.cs
View File

@ -90,7 +90,11 @@ namespace ProjectPassengerTransfers.Forms
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void LoadList() => dataGridView.DataSource = _passengerRepository.ReadPassengers();
private void LoadList()
{
dataGridView.DataSource = _passengerRepository.ReadPassengers();
dataGridView.Columns["Id"].Visible = false;
}
private bool TryGetIdentifierFromSelectedRow(out int id)
{

7
ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoutes.cs
View File

@ -80,7 +80,12 @@ namespace ProjectPassengerTransfers.Forms
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void LoadList() => dataGridView.DataSource = _routeRepository.ReadRoutes();
private void LoadList()
{
dataGridView.DataSource = _routeRepository.ReadRoutes();
dataGridView.Columns["Id"].Visible = false;
}
private bool TryGetIdentifierFromSelectedRow(out int id)
{
id = 0;

2
ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.cs
View File

@ -20,7 +20,7 @@ namespace ProjectPassengerTransfers.Forms
InitializeComponent();
_ticketRepository = ticketRepository ?? throw new ArgumentNullException(nameof(ticketRepository));
comboBoxPassenger.DataSource = passengerRepository.ReadPassengers();
comboBoxPassenger.DisplayMember = "Name";
comboBoxPassenger.DisplayMember = "FullName";
comboBoxPassenger.ValueMember = "Id";
ColumnTrip.DataSource = routeRepository.ReadRoutes();
ColumnTrip.DisplayMember = "Name";

7
ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTickets.cs
View File

@ -75,7 +75,12 @@ namespace ProjectPassengerTransfers.Forms
}
}
private void LoadList() => dataGridView.DataSource = _ticketRepository.ReadTickets();
private void LoadList()
{
dataGridView.DataSource = _ticketRepository.ReadTickets();
dataGridView.Columns["Id"].Visible = false;
}
private bool TryGetIdentifierFromSelectedRow(out int id)
{
id = 0;

6
ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrips.cs
View File

@ -47,6 +47,10 @@ namespace ProjectPassengerTransfers.Forms
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void LoadList() => dataGridView.DataSource = _tripRepository.ReadTrips();
private void LoadList()
{
dataGridView.DataSource = _tripRepository.ReadTrips();
dataGridView.Columns["Id"].Visible = false;
}
}
}

3
ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/ITicketRepository.cs
View File

@ -4,8 +4,7 @@ namespace ProjectPassengerTransfers.Repositories;
public interface ITicketRepository
{
IEnumerable<Ticket> ReadTickets(DateTime? dateForm =
null,int? trip_Id = null, int? passenger_Id = null);
IEnumerable<Ticket> ReadTickets(DateTime? dateFrom = null, DateTime? dateTo = null);
void CreateTicket(Ticket ticket);
void DeleteTicket(int id);

30
ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/QueryBuilder.cs Normal file
View File

@ -0,0 +1,30 @@
using System.Text;
namespace ProjectPassengerTransfers.Repositories.Implementations;
internal class QueryBuilder
{
private readonly StringBuilder _builder;
public QueryBuilder()
{
_builder = new();
}
public QueryBuilder AddCondition(string condition)
{
if (_builder.Length > 0)
{
_builder.Append(" AND ");
}
_builder.Append(condition);
return this;
}
public string Build()
{
if (_builder.Length == 0)
{
return string.Empty;
}
return $"WHERE {_builder}";
}
}

52
ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TicketRepository.cs
View File

@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using ProjectPassengerTransfers.Entities;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ProjectPassengerTransfers.Repositories.Implementations;
@ -80,18 +81,55 @@ internal class TicketRepository : ITicketRepository
}
}
public IEnumerable<Ticket> ReadTickets(DateTime? dateForm = null, int? ticketId = null, int? passengerId = null)
public IEnumerable<Ticket> ReadTickets(DateTime? dateFrom = null, DateTime? dateTo = null)
{
_logger.LogInformation("Получение всех объектов");
_logger.LogInformation("Получение всех объектов");
try
{
var builder = new QueryBuilder();
if (dateFrom.HasValue)
{
builder.AddCondition("ti.SaleDate >= @dateFrom");
}
if (dateTo.HasValue)
{
builder.AddCondition("ti.SaleDate <= @dateTo");
}
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @"SELECT ti.*, trt.Trip_Id, trt.Count FROM Ticket ti
INNER JOIN Trip_Tickets trt on trt.TicketID = ti.Id";
var ticket = connection.Query<TempTripTickets>(querySelect);
_logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(ticket));
return ticket.GroupBy(x => x.Id, y => y, (key, value) => Ticket.CreateOperation(value.First(), value.Select(z => TripTicket.CreateElement(0, z.Trip_Id, z.Count)))).ToList();
var querySelect = $@"SELECT
ti.*,
CONCAT(ps.Name, ' ', ps.Surname) as PassengerName,
trt.Trip_Id,
trt.Count,
CONCAT(tr.Departure, ' - ', tr.Arrival) as TripName
FROM Ticket ti
LEFT JOIN Passenger ps on ps.Id = ti.Passenger_ID
INNER JOIN Trip_Tickets trt on trt.TicketID = ti.Id
LEFT JOIN Trip tr on tr.ID = trt.Trip_Id
{builder.Build()}";
var ticketsDict = new Dictionary<int, List<TripTicket>>();
var tripTickets = connection.Query<Ticket, TripTicket, Ticket>(querySelect,
(ticket, tripTicket) =>
{
if (!ticketsDict.TryGetValue(ticket.Id, out var trt))
{
trt = [];
ticketsDict.Add(ticket.Id, trt);
}
trt.Add(tripTicket);
return ticket;
}, splitOn: "Trip_Id", param: new { dateFrom, dateTo });
_logger.LogDebug("Полученные объекты: {json}",
JsonConvert.SerializeObject(tripTickets));
return ticketsDict.Select(x =>
{
var cf = tripTickets.First(y => y.Id == x.Key);
cf.SetTripTickets(x.Value);
return cf;
}).ToArray();
}
catch (Exception ex)
{

5
ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TripRepository.cs
View File

@ -47,7 +47,10 @@ int? tripId = null, int? routeId = null, int? busId = null)
{
using var connection = new
NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = "SELECT * FROM Trip";
var querySelect = @"SELECT tr.*, ro.Name as RouteName, bu.SeatCount as BusCount, bu.BusModel as BusModel
FROM Trip tr
LEFT JOIN Route ro on ro.Id = tr.Route_ID
LEFT JOIN Bus bu on bu.Id = tr.Bus_ID";
var trips =
connection.Query<Trip>(querySelect);
_logger.LogDebug("Полученные объекты: {json}",