From be215f067228655fa47a452eb0d93c3b96d18781 Mon Sep 17 00:00:00 2001
From: ikswi <ikswi@yandex.ru>
Date: Mon, 16 Dec 2024 16:10:46 +0400
Subject: [PATCH 1/2] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?=
 =?UTF-8?q?=20=D0=B2=D1=82=D0=BE=D1=80=D0=B0=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Ticket.cs                        |   6 +-
 .../Entities/Trip.cs                          |  10 +-
 .../Entities/TripTicket.cs                    |   9 +-
 .../Forms/FormRoute.Designer.cs               |   1 +
 .../Forms/FormRoute.resx                      |   4 +-
 .../Forms/FormTicket.Designer.cs              |  11 +-
 .../Forms/FormTicket.cs                       |   4 +-
 .../Forms/FormTicket.resx                     |   7 +-
 .../ProjectPassengerTransfers/Program.cs      |  22 ++++
 .../ProjectPassengerTransfers.csproj          |  11 ++
 .../Repositories/IConnectionString.cs         |  12 ++
 .../Repositories/ITicketRepository.cs         |   2 +-
 .../Implementations/BusRepository.cs          | 105 ++++++++++++++++-
 .../Implementations/ConnectionString.cs       |  12 ++
 .../Implementations/PassengerRepository.cs    | 106 +++++++++++++++++-
 .../Implementations/RouteRepository.cs        | 101 ++++++++++++++++-
 .../Implementations/TicketRepository.cs       |  86 +++++++++++++-
 .../Implementations/TripRepository.cs         |  50 ++++++++-
 .../appsettings.json                          |  15 +++
 19 files changed, 542 insertions(+), 32 deletions(-)
 create mode 100644 ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/IConnectionString.cs
 create mode 100644 ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/ConnectionString.cs
 create mode 100644 ProjectPassengerTransfers/ProjectPassengerTransfers/appsettings.json

diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Ticket.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Ticket.cs
index dc9990c..fee6046 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Ticket.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Ticket.cs
@@ -4,15 +4,15 @@ public class Ticket
 {
     public int Id { get; private set; }
     public DateTime SaleDate { get; private set; }
-    public int PassengerId { get; private set; }
+    public int Passenger_Id { get; private set; }
     public IEnumerable<TripTicket> TripTickets { get; private set; } = [];
-    public static Ticket CreateOperation(int id, int passengerId, IEnumerable<TripTicket> tripTickets)
+    public static Ticket CreateOperation(int id, int passenger_Id, IEnumerable<TripTicket> tripTickets)
     {
         return new Ticket
         {
             Id = id,
             SaleDate = DateTime.Now,
-            PassengerId = passengerId,
+            Passenger_Id = passenger_Id,
             TripTickets = tripTickets
         };
     }
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs
index 98dd800..d2aebdd 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs
@@ -11,18 +11,18 @@ public class Trip
     public int Id { get; private set; }
     public DateTime Departure { get; private set; } 
     public DateTime Arrival { get; private set; }
-    public int Route { get; private set; }
-    public int Bus { get; private set; }
+    public int Route_Id { get; private set; }
+    public int Bus_Id { get; private set; }
 
-    public static Trip CreateOperation(int id, int route, int bus)
+    public static Trip CreateOperation(int id, int route_Id, int bus_Id)
     {
         return new Trip
         {
             Id = id,
             Departure = DateTime.Now,
             Arrival = DateTime.Now,
-            Route = route,
-            Bus = bus
+            Route_Id = route_Id,
+            Bus_Id = bus_Id
         };
     }
 
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/TripTicket.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/TripTicket.cs
index 3115ac6..c298e64 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/TripTicket.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/TripTicket.cs
@@ -9,13 +9,16 @@ namespace ProjectPassengerTransfers.Entities;
 public class TripTicket
 {
     public int Id { get; private set; }
-    public int TicketId { get; private set; }
-    public static TripTicket CreateElement(int id, int ticketId)
+    public int Trip_Id { get; private set; }
+
+    public int Count { get; private set; }
+    public static TripTicket CreateElement(int id, int trip_Id, int count)
     {
         return new TripTicket
         {
             Id = id,
-            TicketId = ticketId
+            Trip_Id = trip_Id,
+            Count = count
         };
     }
 }
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoute.Designer.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoute.Designer.cs
index 5a25708..1a56b35 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoute.Designer.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoute.Designer.cs
@@ -80,6 +80,7 @@
             // numericUpDownDistance
             // 
             numericUpDownDistance.Location = new Point(168, 217);
+            numericUpDownDistance.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
             numericUpDownDistance.Name = "numericUpDownDistance";
             numericUpDownDistance.Size = new Size(150, 27);
             numericUpDownDistance.TabIndex = 4;
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoute.resx b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoute.resx
index af32865..8b2ff64 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoute.resx
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormRoute.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.Designer.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.Designer.cs
index 4f63610..16dcde4 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.Designer.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.Designer.cs
@@ -35,6 +35,7 @@
             buttonSave = new Button();
             buttonCancel = new Button();
             ColumnTrip = new DataGridViewComboBoxColumn();
+            ColumnCount = new DataGridViewTextBoxColumn();
             groupBoxTickets.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridViewTickets).BeginInit();
             SuspendLayout();
@@ -53,7 +54,7 @@
             // dataGridViewTickets
             // 
             dataGridViewTickets.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewTickets.Columns.AddRange(new DataGridViewColumn[] { ColumnTrip });
+            dataGridViewTickets.Columns.AddRange(new DataGridViewColumn[] { ColumnTrip, ColumnCount });
             dataGridViewTickets.Dock = DockStyle.Fill;
             dataGridViewTickets.Location = new Point(3, 23);
             dataGridViewTickets.Name = "dataGridViewTickets";
@@ -107,6 +108,13 @@
             ColumnTrip.Name = "ColumnTrip";
             ColumnTrip.Width = 125;
             // 
+            // ColumnCount
+            // 
+            ColumnCount.HeaderText = "Количество билетов";
+            ColumnCount.MinimumWidth = 6;
+            ColumnCount.Name = "ColumnCount";
+            ColumnCount.Width = 125;
+            // 
             // FormTicket
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -134,5 +142,6 @@
         private Button buttonSave;
         private Button buttonCancel;
         private DataGridViewComboBoxColumn ColumnTrip;
+        private DataGridViewTextBoxColumn ColumnCount;
     }
 }
\ No newline at end of file
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.cs
index e5ceeb6..787360a 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.cs
@@ -50,11 +50,11 @@ namespace ProjectPassengerTransfers.Forms
             var list = new List<TripTicket>();
             foreach (DataGridViewRow row in dataGridViewTickets.Rows)
             {
-                if (row.Cells["ColumnFeed"].Value == null)
+                if (row.Cells["ColumnTrip"].Value == null || row.Cells["ColumnCount"].Value == null)
                 {
                     continue;
                 }
-                list.Add(TripTicket.CreateElement(0, Convert.ToInt32(row.Cells["ColumnBus"].Value)));
+                list.Add(TripTicket.CreateElement(0, Convert.ToInt32(row.Cells["ColumnTrip"].Value), Convert.ToInt32(row.Cells["ColumnCount"].Value)));
             }
             return list;
         }
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.resx b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.resx
index af32865..169afab 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.resx
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTicket.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Program.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Program.cs
index 39452bc..7bb308d 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Program.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Program.cs
@@ -1,6 +1,10 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using ProjectPassengerTransfers.Repositories;
 using ProjectPassengerTransfers.Repositories.Implementations;
+using Serilog;
 using Unity;
+using Unity.Microsoft.Logging;
 
 namespace ProjectPassengerTransfers
 {
@@ -21,13 +25,31 @@ namespace ProjectPassengerTransfers
         private static IUnityContainer CreateContainer()
         {
             var container = new UnityContainer();
+
+            container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
+
             container.RegisterType<IBusRepository, BusRepository>();
             container.RegisterType<IPassengerRepository, PassengerRepository>();
             container.RegisterType<IRouteRepository, RouteRepository>();
             container.RegisterType<ITicketRepository, TicketRepository>();
             container.RegisterType<ITripRepository, TripRepository>();
+
+            container.RegisterType<IConnectionString, ConnectionString>();
+
             return container;
         }
 
+        private static LoggerFactory CreateLoggerFactory()
+        {
+            var loggerFactory = new LoggerFactory();
+            loggerFactory.AddSerilog(new LoggerConfiguration()
+            .ReadFrom.Configuration(new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json")
+            .Build())
+            .CreateLogger());
+            return loggerFactory;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/ProjectPassengerTransfers.csproj b/ProjectPassengerTransfers/ProjectPassengerTransfers/ProjectPassengerTransfers.csproj
index e65362d..2df8c47 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/ProjectPassengerTransfers.csproj
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/ProjectPassengerTransfers.csproj
@@ -10,9 +10,20 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Dapper" Version="2.1.35" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Npgsql" Version="9.0.2" />
+    <PackageReference Include="Serilog" Version="4.2.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Unity" Version="5.11.10" />
     <PackageReference Include="Unity.Abstractions" Version="5.11.7" />
     <PackageReference Include="Unity.Container" Version="5.11.11" />
+    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/IConnectionString.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/IConnectionString.cs
new file mode 100644
index 0000000..fd11c5d
--- /dev/null
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/IConnectionString.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectPassengerTransfers.Repositories;
+
+public interface IConnectionString
+{
+    public string ConnectionString { get; }
+}
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/ITicketRepository.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/ITicketRepository.cs
index 76d696c..23c393b 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/ITicketRepository.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/ITicketRepository.cs
@@ -5,7 +5,7 @@ namespace ProjectPassengerTransfers.Repositories;
 public interface ITicketRepository
 {
     IEnumerable<Ticket> ReadTickets(DateTime? dateForm =
-null,int? ticketId = null, int? passengerId = null);
+null,int? trip_Id = null, int? passenger_Id = null);
     void CreateTicket(Ticket ticket);
     void DeleteTicket(int id);
 
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/BusRepository.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/BusRepository.cs
index 4152110..66b3795 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/BusRepository.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/BusRepository.cs
@@ -1,25 +1,124 @@
-using ProjectPassengerTransfers.Entities;
+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
+using ProjectPassengerTransfers.Entities;
 using ProjectPassengerTransfers.Entities.Enums;
 
 namespace ProjectPassengerTransfers.Repositories.Implementations;
 
 internal class BusRepository : IBusRepository
 {
+    private readonly IConnectionString _connectionString;
+    private readonly ILogger<BusRepository> _logger;
+    public BusRepository(IConnectionString connectionString,
+    ILogger<BusRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
+
     public void CreateBus(Bus bus)
     {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}",
+        JsonConvert.SerializeObject(bus));
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @"
+                INSERT INTO Bus (BusModel, SeatCount)
+                VALUES (@BusModel, @SeatCount)";
+            connection.Execute(queryInsert, bus);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
     }
     public void DeleteBus(int id)
     {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var queryDelete = @"
+                DELETE FROM Bus
+                WHERE Id=@id";
+            connection.Execute(queryDelete, new { id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
     }
     public Bus ReadBusById(int id)
     {
-        return Bus.CreateEntity(0, BusModel.None, 0);
+        _logger.LogInformation("Получение объекта по идентификатору");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = @"
+                SELECT * FROM Bus
+                WHERE Id=@Id";
+            var bus = connection.QueryFirst<Bus>(querySelect,
+            new { id });
+            _logger.LogDebug("Найденный объект: {json}",
+            JsonConvert.SerializeObject(bus));
+            return bus;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при поиске объекта");
+            throw;
+        }
     }
     public IEnumerable<Bus> ReadBuses()
     {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM Bus";
+            var buses = connection.Query<Bus>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}",
+            JsonConvert.SerializeObject(buses));
+            return buses;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
     }
     public void UpdateBus(Bus bus)
     {
+        _logger.LogInformation("Редактирование объекта");
+        _logger.LogDebug("Объект: {json}",
+        JsonConvert.SerializeObject(bus));
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var queryUpdate = @"
+                UPDATE Bus
+                SET
+                BusModel=@BusModel,
+                SeatCount=@SeatCount
+                WHERE Id=@Id";
+            connection.Execute(queryUpdate, bus);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при редактировании объекта");
+            throw;
+        }
     }
 }
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/ConnectionString.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/ConnectionString.cs
new file mode 100644
index 0000000..122a213
--- /dev/null
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/ConnectionString.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectPassengerTransfers.Repositories.Implementations;
+
+public class ConnectionString : IConnectionString
+{
+    string IConnectionString.ConnectionString => "Server=localhost, Port=5432; Username=postgres; Password=18820520; Database=otp; Include Error Detail=true";
+}
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/PassengerRepository.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/PassengerRepository.cs
index aaa87c8..838f0cb 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/PassengerRepository.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/PassengerRepository.cs
@@ -1,25 +1,125 @@
-using ProjectPassengerTransfers.Entities;
+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
+using ProjectPassengerTransfers.Entities;
 using ProjectPassengerTransfers.Entities.Enums;
 
 namespace ProjectPassengerTransfers.Repositories.Implementations;
 
 internal class PassengerRepository : IPassengerRepository
 {
+    private readonly IConnectionString _connectionString;
+    private readonly ILogger<PassengerRepository> _logger;
+    public PassengerRepository(IConnectionString connectionString,
+    ILogger<PassengerRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
+
     public void CreatePassenger(Passenger passenger)
     {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}",
+        JsonConvert.SerializeObject(passenger));
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @"
+                INSERT INTO Passenger (PassengerType, Name, Surname)
+                VALUES (@PassengerType, @Name, @Surname)";
+            connection.Execute(queryInsert, passenger);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
     }
     public void DeletePassenger(int id)
     {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var queryDelete = @"
+                DELETE FROM Passenger
+                WHERE Id=@id";
+            connection.Execute(queryDelete, new { id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
     }
     public Passenger ReadPassengerById(int id)
     {
-        return Passenger.CreateEntity(0, PassengerType.None, string.Empty, string.Empty);
+        _logger.LogInformation("Получение объекта по идентификатору");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = @"
+                SELECT * FROM Passenger
+                WHERE Id=@id";
+            var passenger = connection.QueryFirst<Passenger>(querySelect,
+            new { id });
+            _logger.LogDebug("Найденный объект: {json}",
+            JsonConvert.SerializeObject(passenger));
+            return passenger;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при поиске объекта");
+            throw;
+        }
     }
     public IEnumerable<Passenger> ReadPassengers()
     {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM Passenger";
+            var passengers = connection.Query<Passenger>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}",
+            JsonConvert.SerializeObject(passengers));
+            return passengers;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
     }
     public void UpdatePassenger(Passenger passenger)
     {
+        _logger.LogInformation("Редактирование объекта");
+        _logger.LogDebug("Объект: {json}",
+        JsonConvert.SerializeObject(passenger));
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var queryUpdate = @"
+                UPDATE Passenger
+                SET
+                PassengerType=@PassengerType,
+                Name=@Name,
+                Surname=@Surname
+                WHERE Id=@Id";
+            connection.Execute(queryUpdate, passenger);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при редактировании объекта");
+            throw;
+        }
     }
 }
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/RouteRepository.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/RouteRepository.cs
index 9689784..3573715 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/RouteRepository.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/RouteRepository.cs
@@ -1,24 +1,119 @@
-using ProjectPassengerTransfers.Entities;
+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
+using ProjectPassengerTransfers.Entities;
 
 namespace ProjectPassengerTransfers.Repositories.Implementations;
 
 internal class RouteRepository : IRouteRepository
 {
+    private readonly IConnectionString _connectionString;
+
+    private readonly ILogger<RouteRepository> _logger;
+
+    public RouteRepository(IConnectionString connectionString, ILogger<RouteRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
+
     public void CreateRoute(Route route)
     {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(route));
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @" 
+                INSERT INTO Route (Name, DepartureCity, ArrivalCity, Distance) 
+                VALUES (@Name, @DepartureCity, @ArrivalCity, @Distance)";
+            connection.Execute(queryInsert, route);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
     }
     public void DeleteRoute(int id)
     {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryDelete = @"
+                DELETE FROM Route
+                WHERE Id=@id";
+            connection.Execute(queryDelete, new { id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
     }
     public Route ReadRouteById(int id)
     {
-        return Route.CreateEntity(0, string.Empty, string.Empty, string.Empty, 0);
+        _logger.LogInformation("Получение объекта по идентификатору");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = @"
+                SELECT * FROM Route
+                WHERE Id=@id";
+            var route = connection.QueryFirst<Route>(querySelect, new { id });
+            _logger.LogDebug("Найденный объект: {json}", JsonConvert.SerializeObject(route));
+            return route;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при поиске объекта");
+            throw;
+        }
     }
     public IEnumerable<Route> ReadRoutes()
     {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM Route";
+            var routes = connection.Query<Route>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}",
+            JsonConvert.SerializeObject(routes));
+            return routes;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
     }
     public void UpdateRoute(Route route)
     {
+        _logger.LogInformation("Редактирование объекта");
+        _logger.LogDebug("Объект: {json}",
+        JsonConvert.SerializeObject(route));
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryUpdate = @"
+                UPDATE Route
+                SET
+                Name=@Name,
+                DepartureCity=@DepartureCity,
+                ArrivalCity=@ArrivalCity,
+                Distance=@Distance
+                WHERE Id=@Id";
+            connection.Execute(queryUpdate, route);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при редактировании объекта");
+            throw;
+        }
     }
 }
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TicketRepository.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TicketRepository.cs
index 8a6f6c7..cfa524c 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TicketRepository.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TicketRepository.cs
@@ -1,18 +1,100 @@
-using ProjectPassengerTransfers.Entities;
+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
+using ProjectPassengerTransfers.Entities;
 
 namespace ProjectPassengerTransfers.Repositories.Implementations;
 
 internal class TicketRepository : ITicketRepository
 {
+    private readonly IConnectionString _connectionString;
+    private readonly ILogger<TicketRepository> _logger;
+    public TicketRepository(IConnectionString connectionString,
+    ILogger<TicketRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
+
     public void CreateTicket(Ticket ticket)
     {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}",
+        JsonConvert.SerializeObject(ticket));
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            connection.Open();
+            using var transaction = connection.BeginTransaction();
+            var queryInsert = @"
+                INSERT INTO Ticket (Passenger_Id, SaleDate)
+                VALUES (@Passenger_Id, @SaleDate);
+                SELECT MAX(Id) FROM Ticket";
+            var ticketId = connection.QueryFirst<int>(queryInsert, ticket, transaction);
+            var queryBuyInsert = @"
+                INSERT INTO Trip_tickets (TicketID, Trip_ID, Count)
+                VALUES (@TicketID,@Trip_ID, @Count)";
+            foreach (var elem in ticket.TripTickets)
+            {
+                connection.Execute(queryBuyInsert, new
+                {
+                    ticketId,
+                    elem.Trip_Id,
+                    elem.Count
+                }, transaction);
+            }
+            transaction.Commit();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
     }
     public void DeleteTicket(int id)
     {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            connection.Open();
+            using var transaction = connection.BeginTransaction();
+            var queryDeleteSub = @"
+                DELETE FROM Trip_tickets
+                WHERE TicketId = @id";
+            connection.Execute(queryDeleteSub, new { id }, transaction);
+
+            var queryDelete = @"
+                DELETE FROM Ticket
+                WHERE Id = @id";
+            connection.Execute(queryDelete, new { id }, transaction);
+
+            transaction.Commit();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
     }
 
     public IEnumerable<Ticket> ReadTickets(DateTime? dateForm = null, int? ticketId = null, int? passengerId = null)
     {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM Ticket";
+            var ticket = connection.Query<Ticket>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(ticket));
+            return ticket;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
     }
 }
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TripRepository.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TripRepository.cs
index 4ed50bc..3afbdfc 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TripRepository.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Repositories/Implementations/TripRepository.cs
@@ -1,17 +1,63 @@
-using ProjectPassengerTransfers.Entities;
+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
+using ProjectPassengerTransfers.Entities;
 
 namespace ProjectPassengerTransfers.Repositories.Implementations;
 
 internal class TripRepository : ITripRepository
 {
+    private readonly IConnectionString _connectionString;
+    private readonly ILogger<TripRepository> _logger;
+    public TripRepository(IConnectionString connectionString,
+    ILogger<TripRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
+
     public void CreateTrip(Trip trip)
     {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}",
+        JsonConvert.SerializeObject(trip));
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @"
+            INSERT INTO Trip (Departure, Arrival, Route_Id, Bus_Id)
+            VALUES (@Departure, @Arrival, @Route_Id, @Bus_Id)";
+            connection.Execute(queryInsert, trip);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
     }
 
     public IEnumerable<Trip> ReadTrips(DateTime? dateForm =
 null, DateTime? dateTo = null,
 int? tripId = null, int? routeId = null, int? busId = null)
     {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM Trip";
+            var trips =
+            connection.Query<Trip>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}",
+            JsonConvert.SerializeObject(trips));
+            return trips;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
     }
 }
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/appsettings.json b/ProjectPassengerTransfers/ProjectPassengerTransfers/appsettings.json
new file mode 100644
index 0000000..2f734b4
--- /dev/null
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/appsettings.json
@@ -0,0 +1,15 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Debug",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log.txt",
+          "rollingInterval": "Day"
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
-- 
2.25.1


From 3259ac446bd4683d4e586fd6d921f188d8f155b6 Mon Sep 17 00:00:00 2001
From: ikswi <ikswi@yandex.ru>
Date: Thu, 19 Dec 2024 05:27:36 +0400
Subject: [PATCH 2/2] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Trip.cs                          |  6 +--
 .../Forms/FormTrip.Designer.cs                | 50 ++++++++++++++++++-
 .../Forms/FormTrip.cs                         |  2 +-
 .../Forms/FormTrip.resx                       |  4 +-
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs
index d2aebdd..43f2d65 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs
@@ -14,13 +14,13 @@ public class Trip
     public int Route_Id { get; private set; }
     public int Bus_Id { get; private set; }
 
-    public static Trip CreateOperation(int id, int route_Id, int bus_Id)
+    public static Trip CreateOperation(int id, int route_Id, int bus_Id, DateTime departure, DateTime arrival)
     {
         return new Trip
         {
             Id = id,
-            Departure = DateTime.Now,
-            Arrival = DateTime.Now,
+            Departure = departure,
+            Arrival = arrival,
             Route_Id = route_Id,
             Bus_Id = bus_Id
         };
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.Designer.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.Designer.cs
index ce38c23..74a7be8 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.Designer.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.Designer.cs
@@ -34,6 +34,10 @@
             labelRoute = new Label();
             buttonSave = new Button();
             buttonCancel = new Button();
+            label2 = new Label();
+            label1 = new Label();
+            dateTimePickerEnd = new DateTimePicker();
+            dateTimePickerStart = new DateTimePicker();
             SuspendLayout();
             // 
             // comboBoxRoute
@@ -72,7 +76,7 @@
             // 
             // buttonSave
             // 
-            buttonSave.Location = new Point(43, 225);
+            buttonSave.Location = new Point(41, 260);
             buttonSave.Name = "buttonSave";
             buttonSave.Size = new Size(94, 29);
             buttonSave.TabIndex = 6;
@@ -82,7 +86,7 @@
             // 
             // buttonCancel
             // 
-            buttonCancel.Location = new Point(214, 225);
+            buttonCancel.Location = new Point(212, 260);
             buttonCancel.Name = "buttonCancel";
             buttonCancel.Size = new Size(94, 29);
             buttonCancel.TabIndex = 7;
@@ -90,11 +94,49 @@
             buttonCancel.UseVisualStyleBackColor = true;
             buttonCancel.Click += ButtonCancel_Click;
             // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(21, 212);
+            label2.Name = "label2";
+            label2.Size = new Size(115, 20);
+            label2.TabIndex = 15;
+            label2.Text = "Дата прибытия";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(21, 159);
+            label1.Name = "label1";
+            label1.Size = new Size(110, 20);
+            label1.TabIndex = 14;
+            label1.Text = "Дата отправки";
+            // 
+            // dateTimePickerEnd
+            // 
+            dateTimePickerEnd.Location = new Point(168, 204);
+            dateTimePickerEnd.Margin = new Padding(3, 4, 3, 4);
+            dateTimePickerEnd.Name = "dateTimePickerEnd";
+            dateTimePickerEnd.Size = new Size(177, 27);
+            dateTimePickerEnd.TabIndex = 13;
+            // 
+            // dateTimePickerStart
+            // 
+            dateTimePickerStart.Location = new Point(168, 151);
+            dateTimePickerStart.Margin = new Padding(3, 4, 3, 4);
+            dateTimePickerStart.Name = "dateTimePickerStart";
+            dateTimePickerStart.Size = new Size(177, 27);
+            dateTimePickerStart.TabIndex = 12;
+            // 
             // FormTrip
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(418, 315);
+            Controls.Add(label2);
+            Controls.Add(label1);
+            Controls.Add(dateTimePickerEnd);
+            Controls.Add(dateTimePickerStart);
             Controls.Add(buttonCancel);
             Controls.Add(buttonSave);
             Controls.Add(labelRoute);
@@ -115,5 +157,9 @@
         private Label labelRoute;
         private Button buttonSave;
         private Button buttonCancel;
+        private Label label2;
+        private Label label1;
+        private DateTimePicker dateTimePickerEnd;
+        private DateTimePicker dateTimePickerStart;
     }
 }
\ No newline at end of file
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.cs
index 98429d3..f6c63ea 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.cs
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.cs
@@ -35,7 +35,7 @@ namespace ProjectPassengerTransfers.Forms
                 {
                     throw new Exception("Имеются незаполненные поля");
                 }
-                _tripRepository.CreateTrip(Trip.CreateOperation(0, (int)comboBoxRoute.SelectedValue!, (int)comboBoxBus.SelectedValue!));
+                _tripRepository.CreateTrip(Trip.CreateOperation(0, (int)comboBoxRoute.SelectedValue!, (int)comboBoxBus.SelectedValue!, dateTimePickerStart.Value.Date, dateTimePickerEnd.Value.Date));
                 Close();
             }
             catch (Exception ex)
diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.resx b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.resx
index af32865..8b2ff64 100644
--- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.resx
+++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-- 
2.25.1