Лаба 2 не до конца

GasStation/GasStation/GasStation.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -19,7 +19,19 @@
   </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="8.0.5" />
+    <PackageReference Include="Serilog" Version="4.0.2" />
+    <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.8.6" />
     <PackageReference Include="Unity" Version="5.11.10" />
+    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -37,4 +49,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

GasStation/GasStation/Program.cs

@@ -2,6 +2,10 @@ using GasStation.Repositories.Implementations;
 using GasStation.Repositories;
 using Unity.Lifetime;
 using Unity;
+using Unity.Microsoft.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Serilog;
 
 namespace GasStation
 {
@@ -23,13 +27,30 @@ namespace GasStation
         {
             var container = new UnityContainer();
 
+            container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
+
             container.RegisterType <ICashierRepository, CashierRepository>();
             container.RegisterType <IFuelRepository, FuelRepository>();
             container.RegisterType <IFuelSalesRepository, FuelSalesRepository>();
             container.RegisterType <ISuppliersFuelRepository, SuppliersFuelRepository>();
             container.RegisterType <ISupplierRepository, SupplierRepository>();
 
+            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;
+        }
+
     }
 }

GasStation/GasStation/Repositories/IConnectionString.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasStation.Repositories;
+
+public interface IConnectionString
+{
+    public string ConnectionString { get; }
+}

GasStation/GasStation/Repositories/IFuelRepository.cs

@@ -1,9 +1,4 @@
-using System;
+using GasStation.Entities;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using GasStation.Entities;
 
 namespace GasStation.Repositories;
 

GasStation/GasStation/Repositories/Implementations/CashierRepository.cs

@@ -1,34 +1,133 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Dapper;
 using GasStation.Entities;
 using GasStation.Entities.Enums;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Npgsql;
 
 namespace GasStation.Repositories.Implementations;
 
 public class CashierRepository : ICashierRepository
 {
+    private readonly IConnectionString _connectionString;
+    private readonly ILogger<CashierRepository> _logger;
+
+    public CashierRepository(IConnectionString connectionString, ILogger<CashierRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
+
     public void CreateCashier(Cashier cashier)
     {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(cashier));
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @"
+                INSERT INTO Cashier (FirstName, LastName, CashierPost)
+                VALUES (@FirstName, @LastName, @CashierPost)";
+            connection.Execute(queryInsert, cashier);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
     }
 
     public void DeleteCashier(int id)
     {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryDelete = @"
+                DELETE FROM Cashier
+                WHERE Id=@id";
+            connection.Execute(queryDelete, new { id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
     }
 
     public Cashier ReadCashierById(int id)
     {
-        return Cashier.CreateEntity(0, string.Empty, string.Empty, CashierPost.None);
+        _logger.LogInformation("Получение объекта по идентификатору");
+        _logger.LogDebug("Объект: {id}", id);
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = @"
+                SELECT * FROM Cashier
+                WHERE Id=@id";
+            var cashier = connection.QueryFirst<Cashier>(querySelect, new { id });
+            _logger.LogDebug("Найденный объект: {json}",
+                JsonConvert.SerializeObject(cashier));
+            return cashier;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при поиске объекта");
+            throw;
+        }
     }
 
     public IEnumerable<Cashier> ReadCashiers()
     {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM Cashier";
+            var cashier = connection.Query<Cashier>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}",
+            JsonConvert.SerializeObject(cashier));
+            return cashier;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
     }
 
     public void UpdateCashier(Cashier cashier)
     {
+        _logger.LogInformation("Редактирование объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(cashier));
+
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryUpdate = @"
+                UPDATE Cashier
+                SET
+                FirstName=@FirstName,
+                LastName=@LastName,
+                CashierPost=@CashierPost
+                WHERE Id=@Id";
+            connection.Execute(queryUpdate, cashier);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при редактировании объекта");
+            throw;
+        }
     }
 }

GasStation/GasStation/Repositories/Implementations/ConnectionString.cs

@@ -0,0 +1,6 @@
+namespace GasStation.Repositories.Implementations;
+
+public class ConnectionString : IConnectionString
+{
+    string IConnectionString.ConnectionString => "Server=localhost,5432;Database=egov;Uid=postgres;Pwd=postgres;";
+}

GasStation/GasStation/Repositories/Implementations/FuelRepository.cs

@@ -1,34 +1,121 @@
-using System;
+using GasStation.Entities;
-using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
-using System.Linq;
+using Newtonsoft.Json;
-using System.Text;
+using Npgsql;
-using System.Threading.Tasks;
+using Dapper;
-using GasStation.Entities;
+using System.Data.SqlClient;
-using GasStation.Entities.Enums;
+
 
 namespace GasStation.Repositories.Implementations;
 
 public class FuelRepository : IFuelRepository
 {
+    private readonly IConnectionString _connectionString;
+    private readonly ILogger<FuelRepository> _logger;
+
+    public FuelRepository(IConnectionString connectionString, ILogger<FuelRepository> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+    }
+
     public void CreateFuel(Fuel fuel)
     {
+        _logger.LogInformation("Добавление объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(fuel));
+        
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryInsert = @"
+            INSERT INTO Fuel (Cost, Type)
+            VALUES (@Cost, @Type)";
+            connection.Execute(queryInsert, fuel);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при добавлении объекта");
+            throw;
+        }
     }
 
     public void DeleteFuel(int id)
     {
+        _logger.LogInformation("Удаление объекта");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryDelete = @"
+                DELETE FROM Fuel
+                WHERE Id=@id";
+            connection.Execute(queryDelete, new { id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при удалении объекта");
+            throw;
+        }
     }
 
     public Fuel ReadFuelById(int id)
     {
-        return Fuel.CreateEntity(0, 0, FuelType.Fuel_diesel);
+        _logger.LogInformation("Получение объекта по идентификатору");
+        _logger.LogDebug("Объект: {id}", id);
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = @"
+                SELECT * FROM Fuel
+                WHERE Id=@id";
+            var fuel = connection.QueryFirst<Fuel>(querySelect, new { id });
+            _logger.LogDebug("Найденный объект: {json}", JsonConvert.SerializeObject(fuel));
+            return fuel;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при поиске объекта");
+            throw;
+        }
     }
 
     public IEnumerable<Fuel> ReadFuels()
     {
-        return [];
+        _logger.LogInformation("Получение всех объектов");
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM Fuel";
+            var fuels = connection.Query<Fuel>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(fuels));
+            return fuels;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при чтении объектов");
+            throw;
+        }
     }
 
     public void UpdateFuel(Fuel fuel)
     {
+        _logger.LogInformation("Редактирование объекта");
+        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(fuel));
+        try
+        {
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var queryUpdate = @"
+                UPDATE Fuel
+                SET
+                Cost=@Cost,
+                Type=@Type
+                WHERE Id=@Id";
+            connection.Execute(queryUpdate, fuel);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при редактировании объекта");
+            throw;
+        }
     }
 }

GasStation/GasStation/appsettings.json

@@ -0,0 +1,15 @@
+{
+    "Serilog": {
+        "Using": [ "Serilog.Sinks.File" ],
+        "MinimumLevel": "Debug",
+        "WriteTo": [
+            {
+                "Name": "File",
+                "Args": {
+                    "path": "Logs/gas_log.txt",
+                    "rollingInterval": "Day"
+                }
+            }
+        ]
+    }
+}