криво, плохо, надо фиксить

2024-11-27 12:53:02 +04:00 · 2024-11-27 12:53:02 +04:00 · ed6b1152c6
commit ed6b1152c6
parent 6119b3431e
8 changed files with 405 additions and 13 deletions
--- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Forms/FormBusChecks.Designer.cs
+++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Forms/FormBusChecks.Designer.cs
@ -88,7 +88,7 @@
            Controls.Add(dataGridViewCheck);
            Controls.Add(panel1);
            Name = "FormBusChecks";
-            Text = "Раздачи маршрутов";
+            Text = "Проверки деталей автобуса";
            panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)dataGridViewCheck).EndInit();
            ResumeLayout(false);
--- a/ProjectPeopleTransportation/ProjectPeopleTransportation/ProjectPeopleTransportation.csproj
+++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/ProjectPeopleTransportation.csproj
@ -9,14 +9,17 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Dapper" Version="2.1.35" />
    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Npgsql" Version="9.0.1" />
    <PackageReference Include="Serilog" Version="4.1.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="System.Data.SqlClient" Version="4.9.0" />
    <PackageReference Include="Unity" Version="5.11.10" />
    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
  </ItemGroup>
--- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/BusCheckRepository.cs
+++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/BusCheckRepository.cs
@ -1,19 +1,92 @@
-using ProjectPeopleTransportation.Entities;
+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
+using ProjectPeopleTransportation.Entities;
+using System.Transactions;

 namespace ProjectPeopleTransportation.Repositories.Implementations;

 public class BusCheckRepository : IBusCheckRepository
 {
+    private readonly IConnectionString _connectionString;
+    private readonly ILogger<BusCheckRepository> _logger;
+    public BusCheckRepository(IConnectionString connectionString, ILogger<BusCheckRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
    public void CreateBusCheck(BusCheck busCheck)
    {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(busCheck));
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+
+            connection.Open();
+            using var transaction = connection.BeginTransaction();
+
+            var queryInsert = @"
+INSERT INTO bus_check (date, employee_id)
+VALUES (@Datetime, @EmployeeID);
+SELECT MAX(Id) FROM bus_check";
+
+
+            var busCheckId = connection.QueryFirst<int>(queryInsert, busCheck, transaction);
+
+            var querySubInsert = @"
+INSERT INTO bus_bus_check (bus_id, count)
+VALUES (@BusID, @Count)";
+            foreach (var elem in busCheck.BusBusCheck)
+            {
+                connection.Execute(querySubInsert, new {busCheckId, elem.BusID, elem.Count}, transaction);
+            }
+            transaction.Commit();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
    }

    public void DeleteBusCheck(int id)
    {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new
+            NpgsqlConnection(_connectionString.ConnectionString);
+            var queryDelete = @"
+DELETE FROM bus_check
+WHERE Id=@ID";
+            connection.Execute(queryDelete, new { id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
    }

    public IEnumerable<BusCheck> ReadBusCheck(DateTime? dateForm = null, DateTime? dateTo = null, int? employeeId = null, int? routelistId = null)
    {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM bus_check";
+            var busChecks = connection.Query<BusCheck>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}",
+            JsonConvert.SerializeObject(busChecks));
+            return busChecks;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
    }
 }
--- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/BusRepository.cs
+++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/BusRepository.cs
@ -2,6 +2,10 @@
 using ProjectPeopleTransportation.Entities.Enums;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using System.Data.SqlClient;
+using Npgsql;
+using Dapper;
+

 namespace ProjectPeopleTransportation.Repositories.Implementations;

@ -21,23 +25,104 @@ public class BusRepository : IBusRepository
    {
        _logger.LogInformation("Добавление объекта");
        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(bus));
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @" 
+INSERT INTO bus (detail_name, licence_plate, bus_name) 
+VALUES (@BusElementType, @LicensePlate, @BusName)";
+            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, string.Empty, string.Empty, BusElementType.None);
+        _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
+    detail_name=@BusElementType,
+    licence_plate=@LicensePlate,
+    bus_name=@BusName
+WHERE id=@ID";
+            connection.Execute(queryUpdate, bus);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при редактировании объекта");
+            throw;
+        }
    }
 }
--- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/ConnectionString.cs
+++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/ConnectionString.cs
@ -8,5 +8,5 @@ namespace ProjectPeopleTransportation.Repositories.Implementations;

 internal class ConnectionString : IConnectionString
 {
-    string IConnectionString.ConnectionString => "";
+    string IConnectionString.ConnectionString => "Server=localhost;Port=5432;Database=lab3;User Id=postgres;Password=postgres;";
 }
--- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/EmployeeRepository.cs
+++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/EmployeeRepository.cs
@ -1,29 +1,125 @@
-using ProjectPeopleTransportation.Entities;
+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
+using ProjectPeopleTransportation.Entities;
 using ProjectPeopleTransportation.Entities.Enums;

 namespace ProjectPeopleTransportation.Repositories.Implementations;

 public class EmployeeRepository : IEmployeeRepository
 {
+    private readonly IConnectionString _connectionString;
+
+    private readonly ILogger<EmployeeRepository> _logger;
+
+    public EmployeeRepository(IConnectionString connectionString, ILogger<EmployeeRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
    public void CreateEmployee(Employee employee)
    {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(employee));
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @" 
+INSERT INTO employee (first_name, last_name, post) 
+VALUES (@FirstName, @LastName, @EmployeePost)";
+            connection.Execute(queryInsert, employee);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
    }

    public void DeleteEmployee(int id)
    {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryDelete = @"
+DELETE FROM employee
+WHERE id=@ID";
+            connection.Execute(queryDelete, new { id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
    }

    public Employee ReadEmployeeByID(int id)
    {
-        return Employee.CreateEntity(0, string.Empty, string.Empty, EmployeePost.None);
+        _logger.LogInformation("Получение объекта по идентификатору");
+        _logger.LogDebug("Объект: {id}", id);
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = @"
+SELECT * FROM employee
+WHERE [id]=@ID";
+            var employee = connection.QueryFirst<Employee>(querySelect, new { id });
+            _logger.LogDebug("Найденный объект: {json}", JsonConvert.SerializeObject(employee));
+
+            return employee;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при поиске объекта");
+            throw;
+        }
    }

    public IEnumerable<Employee> ReadEmployees()
    {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM employee";
+            var employees = connection.Query<Employee>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(employees));
+            return employees;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
    }

    public void UpdateEmployee(Employee employee)
    {
+        _logger.LogInformation("Редактирование объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(employee));
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryUpdate = @"
+UPDATE employee
+SET
+    first_name=@FirstName,
+    last_name=@LastName,
+    post=@EmployeePost
+WHERE id=@ID";
+            connection.Execute(queryUpdate, employee);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при редактировании объекта");
+            throw;
+        }
    }
 }
--- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/RouteListRepository.cs
+++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/RouteListRepository.cs
@ -1,29 +1,124 @@
-using ProjectPeopleTransportation.Entities;
+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
+using ProjectPeopleTransportation.Entities;
 using ProjectPeopleTransportation.Entities.Enums;

 namespace ProjectPeopleTransportation.Repositories.Implementations;

 public class RouteListRepository : IRouteListRepository
 {
+    private readonly IConnectionString _connectionString;
+
+    private readonly ILogger<RouteListRepository> _logger;
+
+    public RouteListRepository(IConnectionString connectionString, ILogger<RouteListRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
    public void CreateRouteList(RouteList routeList)
    {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(routeList));
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @" 
+INSERT INTO route_list (route_name, route_description) 
+VALUES (@Name, @Description)";
+            connection.Execute(queryInsert, routeList);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
    }

    public void DeleteRouteList(int id)
    {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryDelete = @"
+DELETE FROM route_list
+WHERE id=@ID";
+            connection.Execute(queryDelete, new { id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
    }

    public RouteList ReadRouteListByID(int id)
    {
-        return RouteList.CreateEntity(0, string.Empty, string.Empty);
+        _logger.LogInformation("Получение объекта по идентификатору");
+        _logger.LogDebug("Объект: {id}", id);
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = @"
+SELECT * FROM route_list
+WHERE [id]=@ID";
+            var routeList = connection.QueryFirst<RouteList>(querySelect, new { id });
+            _logger.LogDebug("Найденный объект: {json}", JsonConvert.SerializeObject(routeList));
+
+            return routeList;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при поиске объекта");
+            throw;
+        }
    }

    public IEnumerable<RouteList> ReadRouteLists()
    {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM route_list";
+            var routeLists = connection.Query<RouteList>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(routeLists));
+            return routeLists;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
    }

    public void UpdateRouteList(RouteList routeList)
    {
+        _logger.LogInformation("Редактирование объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(routeList));
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryUpdate = @"
+UPDATE route_list
+SET
+    route_name=@Name,
+    route_description=@Description  
+WHERE id=@ID";
+            connection.Execute(queryUpdate, routeList);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при редактировании объекта");
+            throw;
+        }
    }
 }
--- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/StartingShiftRepository.cs
+++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Repositories/Implementations/StartingShiftRepository.cs
@ -1,16 +1,56 @@

+using Dapper;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
 using ProjectPeopleTransportation.Entities;

 namespace ProjectPeopleTransportation.Repositories.Implementations;

 public class StartingShiftRepository : IStartingShiftRepository
 {
+    private readonly IConnectionString _connectionString;
+    private readonly ILogger<StartingShiftRepository> _logger;
+    public StartingShiftRepository(IConnectionString connectionString, ILogger<StartingShiftRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
    public void CreateStartingShift(StartingShift startingShift)
    {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(startingShift));
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @" 
+INSERT INTO starting_shift (route_list_id, employee_id, bus_id, shift_durarion) 
+VALUES (@RouteListID, @EmployeeID, @BusID, @ShiftDuration)";
+            connection.Execute(queryInsert, startingShift);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
    }

    public IEnumerable<StartingShift> ReadStartingShifts(DateTime? dateForm = null, DateTime? dateTo = null, int? routeId = null, int? employeeId = null, int? busId = null)
    {
-        return []; 
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM starting_shift";
+            var startingShifts = connection.Query<StartingShift>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(startingShifts));
+            return startingShifts;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
    }
 }