PIbd-23_Baryshev_D.A._Garage_LabWork_2 #2

Closed
xysiboi wants to merge 6 commits from LabWork_2 into LabWork_1
32 changed files with 748 additions and 142 deletions

View File

@ -11,23 +11,20 @@ public class Driver
{
public int Id { get;private set; }
public string First_name { get;private set; } = string.Empty;
public string Fname { get;private set; } = string.Empty;
public string Last_name { get;private set; } = string.Empty;
public string Phone_Number { get;private set; } = string.Empty;
public string Lname { get;private set; } = string.Empty;
public int TruckId { get;private set; }
public static Driver CreateDriver(int id, string fname, string lname ,string phone_num, int tryckid)
public static Driver CreateDriver(int id, string fname, string lname, int truckid)
{
return new Driver
{
Id = id,
First_name = fname,
Last_name = lname,
Phone_Number = phone_num ?? string.Empty,
TruckId = tryckid
Fname = fname,
Lname = lname,
TruckId = truckid
};
}
}

View File

@ -13,6 +13,7 @@ namespace ProjectGarage.Entities.Enums
SCANIA = 2,
KAMAZ = 3,
MAN = 4,
Volvo = 5
Volvo = 5,
SITRAC = 6
}
}

View File

@ -12,9 +12,9 @@ public class Fuel
{
public int Id { get; set; }
public string Name { get; set; } = string.Empty;
public string FuelName { get; set; } = string.Empty;
public FuelType Type { get; set; }
public FuelType FuelType { get; set; }
public int Price { get; set; }
@ -23,8 +23,8 @@ public class Fuel
return new Fuel
{
Id = id,
Name = name,
Type = type,
FuelName = name,
FuelType = type,
Price = price
};
}

View File

@ -10,7 +10,7 @@ public class FuelReplenishment
{
public int Id { get; private set; }
public int DriverId { get; private set; }
public DateTime Date { get; private set; }
public DateTime ReplenishmentDate { get; private set; }
public IEnumerable<FuelFuelReplenishment> FuelFuelReplenishments { get; private set;} = [];
public static FuelReplenishment CreateOpeartion(int id, int driverId, IEnumerable<FuelFuelReplenishment> fuelFuelReplenishments)
@ -19,7 +19,7 @@ public class FuelReplenishment
{
Id = id,
DriverId = driverId,
Date = DateTime.Now,
ReplenishmentDate = DateTime.Now,
FuelFuelReplenishments = fuelFuelReplenishments
};
}

View File

@ -10,21 +10,21 @@ public class Route
{
public int Id { get; set; }
public string Name { get; set; } = string.Empty;
public string RouteName { get; set; } = string.Empty;
public string StartPoint { get; set; } = string.Empty;
public string StartP { get; set; } = string.Empty;
public string FinalPoint { get; set; } = string.Empty;
public string FinalP { get; set; } = string.Empty;
public int Length { get; set; }
public static Route CreateRoute(int id, string startp, string finalp, int len)
public static Route CreateRoute(int id,string name, string startp, string finalp, int len)
{
return new Route() {
Id = id,
Name = startp + " - " + finalp,
StartPoint = startp,
FinalPoint = finalp,
RouteName = name,
StartP = startp,
FinalP = finalp,
Length = len
};
}

View File

@ -13,7 +13,7 @@ public class Truck
public string Numbers { get; private set; } = string.Empty;
public TruckType Type { get; set; }
public TruckType Truck_Type { get; set; }
public int MaxFuel { get; private set; }
@ -23,7 +23,7 @@ public class Truck
{
Id = id,
Numbers = numbers,
Type = type,
Truck_Type = type,
MaxFuel = maxFuel
};
}

View File

@ -32,8 +32,6 @@
textBoxFirstName = new TextBox();
textBoxLastName = new TextBox();
labelLastName = new Label();
textBoxPhoneNum = new TextBox();
labelPhoneNum = new Label();
labelTruckID = new Label();
buttonSaveDriver = new Button();
buttonCancelDriver = new Button();
@ -72,27 +70,10 @@
labelLastName.TabIndex = 2;
labelLastName.Text = "Фамилия";
//
// textBoxPhoneNum
//
textBoxPhoneNum.Location = new Point(120, 115);
textBoxPhoneNum.Name = "textBoxPhoneNum";
textBoxPhoneNum.Size = new Size(183, 27);
textBoxPhoneNum.TabIndex = 5;
textBoxPhoneNum.Text = "+7";
//
// labelPhoneNum
//
labelPhoneNum.AutoSize = true;
labelPhoneNum.Location = new Point(20, 118);
labelPhoneNum.Name = "labelPhoneNum";
labelPhoneNum.Size = new Size(69, 20);
labelPhoneNum.TabIndex = 4;
labelPhoneNum.Text = "Телефон";
//
// labelTruckID
//
labelTruckID.AutoSize = true;
labelTruckID.Location = new Point(34, 164);
labelTruckID.Location = new Point(34, 121);
labelTruckID.Name = "labelTruckID";
labelTruckID.Size = new Size(44, 20);
labelTruckID.TabIndex = 6;
@ -100,7 +81,7 @@
//
// buttonSaveDriver
//
buttonSaveDriver.Location = new Point(20, 231);
buttonSaveDriver.Location = new Point(20, 158);
buttonSaveDriver.Name = "buttonSaveDriver";
buttonSaveDriver.Size = new Size(128, 39);
buttonSaveDriver.TabIndex = 8;
@ -110,7 +91,7 @@
//
// buttonCancelDriver
//
buttonCancelDriver.Location = new Point(175, 231);
buttonCancelDriver.Location = new Point(175, 158);
buttonCancelDriver.Name = "buttonCancelDriver";
buttonCancelDriver.Size = new Size(128, 39);
buttonCancelDriver.TabIndex = 9;
@ -122,7 +103,7 @@
//
comboBoxTruckID.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxTruckID.FormattingEnabled = true;
comboBoxTruckID.Location = new Point(120, 156);
comboBoxTruckID.Location = new Point(120, 113);
comboBoxTruckID.Name = "comboBoxTruckID";
comboBoxTruckID.Size = new Size(183, 28);
comboBoxTruckID.TabIndex = 10;
@ -131,13 +112,11 @@
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(333, 302);
ClientSize = new Size(333, 218);
Controls.Add(comboBoxTruckID);
Controls.Add(buttonCancelDriver);
Controls.Add(buttonSaveDriver);
Controls.Add(labelTruckID);
Controls.Add(textBoxPhoneNum);
Controls.Add(labelPhoneNum);
Controls.Add(textBoxLastName);
Controls.Add(labelLastName);
Controls.Add(textBoxFirstName);
@ -155,8 +134,6 @@
private TextBox textBoxFirstName;
private TextBox textBoxLastName;
private Label labelLastName;
private TextBox textBoxPhoneNum;
private Label labelPhoneNum;
private Label labelTruckID;
private Button buttonSaveDriver;
private Button buttonCancelDriver;

View File

@ -16,6 +16,7 @@ namespace ProjectGarage.Forms
public partial class FormDriver : Form
{
private readonly IDriverRepository _driverRepository;
private int? _driverId;
public int Id
@ -24,16 +25,15 @@ namespace ProjectGarage.Forms
{
try
{
var driver = _driverRepository.ReadDriverByID(value);
if (driver == null)
{
throw new
InvalidDataException(nameof(driver));
}
textBoxFirstName.Text = driver.First_name;
textBoxLastName.Text = driver.Last_name;
//comboBoxTruckID.SelectedItem = driver.TruckId;
textBoxFirstName.Text = driver.Fname;
textBoxLastName.Text = driver.Lname;
comboBoxTruckID.SelectedItem = driver.TruckId;
_driverId = value;
}
catch (Exception ex)
@ -48,7 +48,7 @@ namespace ProjectGarage.Forms
{
InitializeComponent();
_driverRepository = driverRepository ?? throw new ArgumentNullException(nameof(driverRepository));
comboBoxTruckID.DataSource = truckRepository.ReadTrucks();//
comboBoxTruckID.DataSource = truckRepository.ReadTrucks();
comboBoxTruckID.DisplayMember = "Numbers";
comboBoxTruckID.ValueMember = "Id";
}
@ -58,7 +58,7 @@ namespace ProjectGarage.Forms
try
{
if (string.IsNullOrWhiteSpace(textBoxFirstName.Text) || string.IsNullOrWhiteSpace(textBoxLastName.Text)
|| comboBoxTruckID.SelectedIndex < 0)//
|| comboBoxTruckID.SelectedIndex < 0)
{
throw new Exception("Имеются незаполненные поля");
}
@ -82,6 +82,6 @@ namespace ProjectGarage.Forms
private void ButtonCancelDriver_Click(object sender, EventArgs e) => Close();
private Driver CreateDriver(int id) => Driver.CreateDriver(id, textBoxFirstName.Text,
textBoxLastName.Text, textBoxPhoneNum.Text, (int)comboBoxTruckID.SelectedIndex!);//
textBoxLastName.Text, (int)comboBoxTruckID.SelectedIndex);
}
}

View File

@ -52,7 +52,7 @@
dataGridViewDrivers.RowHeadersVisible = false;
dataGridViewDrivers.RowHeadersWidth = 51;
dataGridViewDrivers.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridViewDrivers.Size = new Size(639, 367);
dataGridViewDrivers.Size = new Size(648, 367);
dataGridViewDrivers.TabIndex = 3;
//
// panelFormDriversButtons
@ -61,7 +61,7 @@
panelFormDriversButtons.Controls.Add(buttonDeleteDriver);
panelFormDriversButtons.Controls.Add(buttonAddDriver);
panelFormDriversButtons.Dock = DockStyle.Right;
panelFormDriversButtons.Location = new Point(639, 0);
panelFormDriversButtons.Location = new Point(648, 0);
panelFormDriversButtons.Name = "panelFormDriversButtons";
panelFormDriversButtons.Size = new Size(161, 367);
panelFormDriversButtons.TabIndex = 2;
@ -103,7 +103,7 @@
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 367);
ClientSize = new Size(809, 367);
Controls.Add(dataGridViewDrivers);
Controls.Add(panelFormDriversButtons);
Name = "FormDrivers";

View File

@ -36,7 +36,6 @@ namespace ProjectGarage.Forms
}
}
private void ButtonAddDriver_Click(object sender, EventArgs e)
{
try
@ -106,8 +105,7 @@ namespace ProjectGarage.Forms
MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
id =
Convert.ToInt32(dataGridViewDrivers.SelectedRows[0].Cells["Id"].Value);
id = Convert.ToInt32(dataGridViewDrivers.SelectedRows[0].Cells["Id"].Value);
return true;
}
}

View File

@ -18,6 +18,7 @@ namespace ProjectGarage.Forms
public partial class FormFuel : Form
{
private readonly IFuelRepository _fuelRepository;
private int? _fuelId;
public int Id
@ -33,12 +34,13 @@ namespace ProjectGarage.Forms
}
foreach (FuelType elem in Enum.GetValues(typeof(FuelType)))
{
if ((elem & fuel.Type) != 0)
if ((elem & fuel.FuelType) != 0)
{
checkedListBoxFuel.SetItemChecked(checkedListBoxFuel.Items.IndexOf(elem), true);
}
}
textBoxFuelName.Text = fuel.Name;
textBoxFuelName.Text = fuel.FuelName;
numericUpDownFuelPrice.Value = fuel.Price;
_fuelId = value;
}
catch (Exception ex)

View File

@ -25,10 +25,10 @@ namespace ProjectGarage.Forms
_replenishmentRepository = replenishmentRepository ??
throw new ArgumentNullException(nameof(replenishmentRepository));
comboBoxReplenishmentDriver.DataSource = driverRepository.ReadDrivers();
comboBoxReplenishmentDriver.DisplayMember = "First_name";
comboBoxReplenishmentDriver.DisplayMember = "Fname";
comboBoxReplenishmentDriver.ValueMember = "Id";
ColumnFuel.DataSource = fuelRepository.ReadFuels();
ColumnFuel.DisplayMember = "Name";
ColumnFuel.DisplayMember = "FuelName";
ColumnFuel.ValueMember = "Id";
}
@ -58,13 +58,13 @@ namespace ProjectGarage.Forms
var list = new List<FuelFuelReplenishment>();
foreach (DataGridViewRow row in dataGridViewReplenishment.Rows)
{
if (row.Cells["ColumnFeed"].Value == null ||
row.Cells["ColumnCount"].Value == null)
if (row.Cells["ColumnFuel"].Value == null ||
row.Cells["ColumnAmount"].Value == null)
{
continue;
}
list.Add(FuelFuelReplenishment.CreateElement(0, Convert.ToInt32(row.Cells["ColumnFeed"].Value),
Convert.ToInt32(row.Cells["ColumnCount"].Value)));
list.Add(FuelFuelReplenishment.CreateElement(0, Convert.ToInt32(row.Cells["ColumnFuel"].Value),
Convert.ToInt32(row.Cells["ColumnAmount"].Value)));
}
return list;
}

View File

@ -36,13 +36,15 @@
buttonRouteFinal = new Button();
textBoxRouteStart = new TextBox();
textBoxRouteFinal = new TextBox();
textBoxRouteName = new TextBox();
labelRouteName = new Label();
((System.ComponentModel.ISupportInitialize)numericUpDownRouteLen).BeginInit();
SuspendLayout();
//
// labelRouteStart
//
labelRouteStart.AutoSize = true;
labelRouteStart.Location = new Point(12, 20);
labelRouteStart.Location = new Point(22, 62);
labelRouteStart.Name = "labelRouteStart";
labelRouteStart.Size = new Size(135, 20);
labelRouteStart.TabIndex = 0;
@ -51,7 +53,7 @@
// labelRouteFinal
//
labelRouteFinal.AutoSize = true;
labelRouteFinal.Location = new Point(12, 62);
labelRouteFinal.Location = new Point(22, 104);
labelRouteFinal.Name = "labelRouteFinal";
labelRouteFinal.Size = new Size(127, 20);
labelRouteFinal.TabIndex = 1;
@ -59,7 +61,8 @@
//
// numericUpDownRouteLen
//
numericUpDownRouteLen.Location = new Point(160, 103);
numericUpDownRouteLen.Location = new Point(170, 145);
numericUpDownRouteLen.Maximum = new decimal(new int[] { 10000, 0, 0, 0 });
numericUpDownRouteLen.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
numericUpDownRouteLen.Name = "numericUpDownRouteLen";
numericUpDownRouteLen.Size = new Size(150, 27);
@ -69,7 +72,7 @@
// labelRouteLen
//
labelRouteLen.AutoSize = true;
labelRouteLen.Location = new Point(12, 103);
labelRouteLen.Location = new Point(22, 145);
labelRouteLen.Name = "labelRouteLen";
labelRouteLen.Size = new Size(127, 20);
labelRouteLen.TabIndex = 3;
@ -77,7 +80,7 @@
//
// buttonRouteSave
//
buttonRouteSave.Location = new Point(12, 149);
buttonRouteSave.Location = new Point(22, 191);
buttonRouteSave.Name = "buttonRouteSave";
buttonRouteSave.Size = new Size(135, 29);
buttonRouteSave.TabIndex = 4;
@ -87,7 +90,7 @@
//
// buttonRouteFinal
//
buttonRouteFinal.Location = new Point(160, 149);
buttonRouteFinal.Location = new Point(170, 191);
buttonRouteFinal.Name = "buttonRouteFinal";
buttonRouteFinal.Size = new Size(150, 29);
buttonRouteFinal.TabIndex = 5;
@ -97,23 +100,41 @@
//
// textBoxRouteStart
//
textBoxRouteStart.Location = new Point(160, 20);
textBoxRouteStart.Location = new Point(170, 62);
textBoxRouteStart.Name = "textBoxRouteStart";
textBoxRouteStart.Size = new Size(150, 27);
textBoxRouteStart.TabIndex = 6;
//
// textBoxRouteFinal
//
textBoxRouteFinal.Location = new Point(160, 62);
textBoxRouteFinal.Location = new Point(170, 104);
textBoxRouteFinal.Name = "textBoxRouteFinal";
textBoxRouteFinal.Size = new Size(150, 27);
textBoxRouteFinal.TabIndex = 7;
//
// textBoxRouteName
//
textBoxRouteName.Location = new Point(179, 12);
textBoxRouteName.Name = "textBoxRouteName";
textBoxRouteName.Size = new Size(141, 27);
textBoxRouteName.TabIndex = 9;
//
// labelRouteName
//
labelRouteName.AutoSize = true;
labelRouteName.Location = new Point(22, 19);
labelRouteName.Name = "labelRouteName";
labelRouteName.Size = new Size(151, 20);
labelRouteName.TabIndex = 8;
labelRouteName.Text = "Название маршрута";
//
// FormRoute
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(332, 199);
ClientSize = new Size(332, 240);
Controls.Add(textBoxRouteName);
Controls.Add(labelRouteName);
Controls.Add(textBoxRouteFinal);
Controls.Add(textBoxRouteStart);
Controls.Add(buttonRouteFinal);
@ -139,5 +160,7 @@
private Button buttonRouteFinal;
private TextBox textBoxRouteStart;
private TextBox textBoxRouteFinal;
private TextBox textBoxRouteName;
private Label labelRouteName;
}
}

View File

@ -31,8 +31,9 @@ namespace ProjectGarage.Forms
throw new InvalidDataException(nameof(route));
}
textBoxRouteStart.Text = route.StartPoint;
textBoxRouteFinal.Text = route.FinalPoint;
textBoxRouteName.Text = route.RouteName;
textBoxRouteStart.Text = route.StartP;
textBoxRouteFinal.Text = route.FinalP;
numericUpDownRouteLen.Value = route.Length;
_routeId = value;
}
@ -79,7 +80,7 @@ namespace ProjectGarage.Forms
private void ButtonRouteFinal_Click(object sender, EventArgs e) => Close();
private Route CreateRoute(int id) => Route.CreateRoute(id, textBoxRouteStart.Text,
private Route CreateRoute(int id) => Route.CreateRoute(id, textBoxRouteName.Text, textBoxRouteStart.Text,
textBoxRouteFinal.Text, Convert.ToInt32(numericUpDownRouteLen.Value));
}
}

View File

@ -53,21 +53,30 @@ namespace ProjectGarage.Forms
}
private void ButtonUpdateRoute_Click(object sender, EventArgs e)
private void ButtonDeleteRoute_Click(object sender, EventArgs e)
{
if (!TryGetIdentifierFromSelectedRow(out var findId))
{
return;
}
if (MessageBox.Show("Удалить запись?", "Удаление",
MessageBoxButtons.YesNo) != DialogResult.Yes)
{
return;
}
try
{
_container.Resolve<FormRoute>().ShowDialog();
_routeRepository.DeleteRoute(findId);
LoadList();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при добавлении",
MessageBox.Show(ex.Message, "Ошибка при удалении",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void ButtonDeleteRoute_Click(object sender, EventArgs e)
private void ButtonUpdateRoute_Click(object sender, EventArgs e)
{
if (!TryGetIdentifierFromSelectedRow(out var findId))
{

View File

@ -25,15 +25,15 @@ namespace ProjectGarage.Forms
throw new ArgumentNullException(nameof(transportationRepository));
comboBoxDriver.DataSource = driverRepository.ReadDrivers();
comboBoxDriver.DisplayMember = "First_name";
comboBoxDriver.DisplayMember = "Fname";
comboBoxDriver.ValueMember = "Id";
comboBoxFuel.DataSource = fuelRepository.ReadFuels();
comboBoxFuel.DisplayMember = "Name";
comboBoxFuel.DisplayMember = "FuelName";
comboBoxFuel.ValueMember = "Id";
comboBoxRoute.DataSource = routeRepository.ReadRoute();
comboBoxRoute.DisplayMember = "Name";
comboBoxRoute.DisplayMember = "RouteName";
comboBoxRoute.ValueMember = "Id";
}

View File

@ -61,14 +61,14 @@
dataGridViewTransportations.RowHeadersVisible = false;
dataGridViewTransportations.RowHeadersWidth = 51;
dataGridViewTransportations.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridViewTransportations.Size = new Size(639, 450);
dataGridViewTransportations.Size = new Size(847, 450);
dataGridViewTransportations.TabIndex = 7;
//
// panelFormTransportationsButtons
//
panelFormTransportationsButtons.Controls.Add(buttonAddTransportation);
panelFormTransportationsButtons.Dock = DockStyle.Right;
panelFormTransportationsButtons.Location = new Point(639, 0);
panelFormTransportationsButtons.Location = new Point(847, 0);
panelFormTransportationsButtons.Name = "panelFormTransportationsButtons";
panelFormTransportationsButtons.Size = new Size(161, 450);
panelFormTransportationsButtons.TabIndex = 6;
@ -77,7 +77,7 @@
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450);
ClientSize = new Size(1008, 450);
Controls.Add(dataGridViewTransportations);
Controls.Add(panelFormTransportationsButtons);
Name = "FormTransportations";

View File

@ -76,6 +76,7 @@
// numericUpDownMaxFuel
//
numericUpDownMaxFuel.Location = new Point(158, 115);
numericUpDownMaxFuel.Maximum = new decimal(new int[] { 3000, 0, 0, 0 });
numericUpDownMaxFuel.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
numericUpDownMaxFuel.Name = "numericUpDownMaxFuel";
numericUpDownMaxFuel.Size = new Size(183, 27);

View File

@ -22,8 +22,9 @@ namespace ProjectGarage.Forms
}
textBoxTruckNumbers.Text = truck.Numbers;
comboBoxTruckType.SelectedItem = truck.Type;
comboBoxTruckType.SelectedItem = truck.Truck_Type;
numericUpDownMaxFuel.Value = truck.MaxFuel;
_truckId = value;
}
catch (Exception ex)
{

View File

@ -32,7 +32,7 @@ namespace ProjectGarage.Forms
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при закгрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
@ -56,7 +56,7 @@ namespace ProjectGarage.Forms
return;
}
if (MessageBox.Show("Удалить звпись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
{
return;
}

View File

@ -1,6 +1,11 @@
using ProjectGarage.Repositories;
using ProjectGarage.Repositories.Implementations;
using Unity.Lifetime;
using Unity;
using Unity.Microsoft.Logging;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Serilog;
namespace ProjectGarage
{
@ -21,15 +26,30 @@ namespace ProjectGarage
private static IUnityContainer CreateContainer()
{
var container = new UnityContainer();
container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
container.RegisterType<ITruckRepository, TruckRepository>();
container.RegisterType<IFuelRepository, FuelRepository>();
container.RegisterType<IRouteRepository, RouteRepository>();
container.RegisterType<IDriverRepository, DriverRepository>();
container.RegisterType<ITransportationRepository, TransportationRepository>();
container.RegisterType<IReplenishmentRepository, FuelReplishmentRepository>();
container.RegisterType<IReplenishmentRepository, ReplenishmentRepository>();
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;
}
}
}

View File

@ -9,7 +9,19 @@
</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.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.9.0" />
<PackageReference Include="Unity" Version="5.11.10" />
<PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
</ItemGroup>
<ItemGroup>
@ -27,4 +39,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>

View File

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

View File

@ -12,6 +12,4 @@ public interface ITransportationRepository
IEnumerable<Transportation> ReadTransportation(DateTime? dateForm = null, DateTime? dateTo = null, int? fuelId = null,
int? driverId = null, int? routeId = null);
void CreateTransportation(Transportation transportation);
void DeleteTransportation(int id);
}

View File

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectGarage.Repositories.Implementations;
public class ConnectionString : IConnectionString
{
string IConnectionString.ConnectionString => "Host=localhost;Port=5432;Username=postgres;Password=postgres;Database=garage";
}

View File

@ -1,6 +1,11 @@
using ProjectGarage.Entities;
using Dapper;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using ProjectGarage.Entities;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -9,19 +14,118 @@ namespace ProjectGarage.Repositories.Implementations;
public class DriverRepository : IDriverRepository
{
public readonly IConnectionString _connectionString;
private readonly ILogger<DriverRepository> _logger;
public DriverRepository(IConnectionString connectionString, ILogger<DriverRepository> logger)
{
_connectionString = connectionString;
_logger = logger;
}
public void CreateDriver(Driver driver)
{
_logger.LogInformation("Добавление объект");
_logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(driver));
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var queryInsert = @"
INSERT INTO driver (Fname, Lname, TruckId) VALUES
(@Fname, @Lname, @TruckId);";
connection.Execute(queryInsert, driver);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при добавлении объекта");
throw;
}
}
public void UpdateDriver(Driver driver)
{
_logger.LogInformation("Редактирование объекта");
_logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(driver));
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var queryUpdate = @"
UPDATE driver
SET
Fname=@Fname,
Lname=@Lname,
TruckId=@TruckId
WHERE Id=@Id";
connection.Execute(queryUpdate, driver);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при редактировании объекта");
throw;
}
}
public void DeleteDriver(int id)
{
_logger.LogInformation("Удаление объекта");
_logger.LogDebug("Объект: {id}", id);
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var queryDelete = @"
DELETE FROM driver
WHERE Id=@id";
connection.Execute(queryDelete, new { id });
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при удалении объекта");
throw;
}
}
public Driver ReadDriverByID(int id) => Driver.CreateDriver(0, string.Empty, string.Empty, string.Empty, 0);
public IEnumerable<Driver> ReadDrivers() => [];
public void UpdateDriver(Driver driver)
public Driver ReadDriverByID(int id)
{
_logger.LogInformation("Получение объекта по идентификатору");
_logger.LogDebug("Объект: {id}", id);
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @"
SELECT * FROM driver
WHERE Id=@id";
var driver = connection.QueryFirst<Driver>(querySelect, new { id });
_logger.LogDebug("Найденный объект: {json}", JsonConvert.SerializeObject(driver));
return driver;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при поиске объекта");
throw;
}
}
public IEnumerable<Driver> ReadDrivers()
{
_logger.LogInformation("Получение всех объектов");
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @"SELECT * FROM driver";
var drivers = connection.Query<Driver>(querySelect);
_logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(drivers));
return drivers;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при чтении объектов");
throw;
}
}
}

View File

@ -1,4 +1,8 @@
using ProjectGarage.Entities;
using Dapper;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using ProjectGarage.Entities;
using ProjectGarage.Entities.Enums;
using System;
using System.Collections.Generic;
@ -10,19 +14,116 @@ namespace ProjectGarage.Repositories.Implementations;
public class FuelRepository : IFuelRepository
{
public 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 (FuelName, FuelType, Price) VALUES
(@FuelName, @FuelType, @Price);";
connection.Execute(queryInsert, fuel);
}
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
FuelName=@FuelName,
FuelType=@FuelType,
Price=@Price
WHERE Id=@Id";
connection.Execute(queryUpdate, 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) => Fuel.CreateFuel(0, string.Empty, FuelType.None, 0);
public IEnumerable<Fuel> ReadFuels() => [];
public void UpdateFuel(Fuel fuel)
public Fuel ReadFuelByID(int id)
{
_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()
{
_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;
}
}
}

View File

@ -1,24 +1,101 @@
using ProjectGarage.Entities;
using Dapper;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using ProjectGarage.Entities;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectGarage.Repositories.Implementations;
public class FuelReplishmentRepository : IReplenishmentRepository
public class ReplenishmentRepository : IReplenishmentRepository
{
public void CreateFuelReplenishment(FuelReplenishment fuelReplenishment)
private readonly IConnectionString _connectionString;
private readonly ILogger<ReplenishmentRepository> _logger;
public ReplenishmentRepository(IConnectionString connectionString, ILogger<ReplenishmentRepository> logger)
{
_connectionString = connectionString;
_logger = logger;
}
public void CreateFuelReplenishment(FuelReplenishment replenishment)
{
_logger.LogInformation("Добавление объекта");
_logger.LogDebug("Объект: {json}",
JsonConvert.SerializeObject(replenishment));
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
connection.Open();
using var transaction = connection.BeginTransaction();
var queryInsert = @"
INSERT INTO fuelreplenishment (DriverId, ReplenishmentDate)
VALUES (@DriverId, @ReplenishmentDate);
SELECT MAX(Id) FROM fuelreplenishment";
var ReplenishmentId = connection.QueryFirst<int>(queryInsert, replenishment, transaction);
var querySubInsert = @"
INSERT INTO fuel_fuelreplenishment (ReplenishmentId, FuelId, Amount)
VALUES (@ReplenishmentId, @FuelId, @Amount)";
foreach (var elem in replenishment.FuelFuelReplenishments)
{
connection.Execute(querySubInsert, new
{
ReplenishmentId,
elem.FuelId,
elem.Amount
}, transaction);
}
transaction.Commit();
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при добавлении объекта");
throw;
}
}
public void DeleteFuelReplenishment(int id)
{
_logger.LogInformation("Удаление объекта");
_logger.LogDebug("Объект: {id}", id);
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var queryDelete = @"
DELETE FROM fuelreplenishment
WHERE Id=@id";
connection.Execute(queryDelete, new { id });
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при удалении объекта");
throw;
}
}
public IEnumerable<FuelReplenishment> ReadFuelReplenishment(DateTime? dateForm = null, DateTime? dateTo = null, int? fuelId = null, int? driverId = null, int? routeId = null)
public IEnumerable<FuelReplenishment> ReadFuelReplenishment(DateTime? dateForm = null,
DateTime? dateTo = null, int? fuelId = null, int? driverId = null, int? routeId = null)
{
return [];
_logger.LogInformation("Получение всех объектов");
try
{
using var connection = new
NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @"SELECT * FROM fuelreplenishment";
var replenishments = connection.Query<FuelReplenishment>(querySelect);
_logger.LogDebug("Полученные объекты: {json}",
JsonConvert.SerializeObject(replenishments));
return replenishments;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при чтении объектов");
throw;
}
}
}

View File

@ -1,4 +1,8 @@
using ProjectGarage.Entities;
using Dapper;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using ProjectGarage.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
@ -9,26 +13,117 @@ namespace ProjectGarage.Repositories.Implementations;
public class RouteRepository : IRouteRepository
{
public void CreateFuelReplenishment(FuelReplenishment fuelReplenishment)
{
}
public 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 (RouteName, Startp, Finalp, Length) VALUES
(@RouteName, @Startp, @Finalp, @Length);";
connection.Execute(queryInsert, route);
}
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
RouteName=@RouteName,
Startp=@Startp,
Finalp=@Finalp,
Length=@Length
WHERE Id=@Id";
connection.Execute(queryUpdate, 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) => Route.CreateRoute(0, string.Empty, string.Empty, 0);
public Route ReadRouteByID(int id)
{
_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> ReadRoute(string? startPoint = null, string? finalPoint = null)
{
return [];
}
public void UpdateRoute(Route route)
{
_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;
}
}
}

View File

@ -1,6 +1,11 @@
using ProjectGarage.Entities;
using Dapper;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using ProjectGarage.Entities;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -9,17 +14,54 @@ namespace ProjectGarage.Repositories.Implementations;
public class TransportationRepository : ITransportationRepository
{
private readonly IConnectionString _connectionString;
private readonly ILogger<TransportationRepository> _logger;
public TransportationRepository(IConnectionString connectionString, ILogger<TransportationRepository> logger)
{
_connectionString = connectionString;
_logger = logger;
}
public void CreateTransportation(Transportation transportation)
{
_logger.LogInformation("Добавление объекта");
_logger.LogDebug("Объект: {json}",
JsonConvert.SerializeObject(transportation));
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var queryInsert = @"
INSERT INTO transportation (DriverId, RouteId, FuelId, Amount, TransportationDate)
VALUES (@DriverId, @RouteId, @FuelId, @Amount, @TransportationDate)";
connection.Execute(queryInsert, transportation);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при добавлении объекта");
throw;
}
}
public void DeleteTransportation(int id)
public IEnumerable<Transportation> ReadTransportation(DateTime? dateForm = null, DateTime? dateTo = null,
int? fuelId = null, int? driverId = null, int? routeId = null)
{
throw new NotImplementedException();
}
_logger.LogInformation("Получение всех объектов");
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = "SELECT * FROM transportation";
var transportations = connection.Query<Transportation>(querySelect);
_logger.LogDebug("Полученные объекты: {json}",
JsonConvert.SerializeObject(transportations));
return transportations;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при чтении объектов");
throw;
}
public IEnumerable<Transportation> ReadTransportation(DateTime? dateForm = null, DateTime? dateTo = null, int? fuelId = null, int? driverId = null, int? routeId = null)
{
return [];
}
}

View File

@ -1,4 +1,8 @@
using ProjectGarage.Entities;
using Dapper;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using ProjectGarage.Entities;
using ProjectGarage.Entities.Enums;
using System;
using System.Collections.Generic;
@ -10,19 +14,117 @@ namespace ProjectGarage.Repositories.Implementations;
public class TruckRepository : ITruckRepository
{
public readonly IConnectionString _connectionString;
private readonly ILogger<TruckRepository> _logger;
public TruckRepository(IConnectionString connectionString, ILogger<TruckRepository> logger)
{
_connectionString = connectionString;
_logger = logger;
}
public void CreateTruck(Truck truck)
{
_logger.LogInformation("Добавление объект");
_logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(truck));
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var queryInsert = @"
INSERT INTO truck (Numbers, Truck_Type, MaxFuel) VALUES
(@Numbers, @Truck_Type, @MaxFuel);";
connection.Execute(queryInsert, truck);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при добавлении объекта");
throw;
}
}
public void UpdateTruck(Truck truck)
{
_logger.LogInformation("Редактирование объекта");
_logger.LogDebug("Объект: {json}",
JsonConvert.SerializeObject(truck));
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var queryUpdate = @"
UPDATE truck
SET
Numbers=@Numbers,
Truck_Type=@Truck_Type,
MaxFuel=@MaxFuel
WHERE Id=@Id";
connection.Execute(queryUpdate, truck);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при редактировании объекта");
throw;
}
}
public void DeleteTruck(int id)
{
_logger.LogInformation("Удаление объекта");
_logger.LogDebug("Объект: {id}", id);
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var queryDelete = @"
DELETE FROM truck
WHERE Id=@id";
connection.Execute(queryDelete, new { id });
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при удалении объекта");
throw;
}
}
public Truck ReadTruckByID(int id) => Truck.CreateTruck(0, string.Empty, TruckType.None, 0);
public IEnumerable<Truck> ReadTrucks() => [];
public void UpdateTruck(Truck truck)
public Truck ReadTruckByID(int id)
{
_logger.LogInformation("Получение объекта по идентификатору");
_logger.LogDebug("Объект: {id}", id);
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @"
SELECT * FROM truck
WHERE Id=@id";
var truck = connection.QueryFirst<Truck>(querySelect, new { id });
_logger.LogDebug("Найденный объект: {json}", JsonConvert.SerializeObject(truck));
return truck;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при поиске объекта");
throw;
}
}
public IEnumerable<Truck> ReadTrucks()
{
_logger.LogInformation("Получение всех объектов");
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @"SELECT * FROM truck";
var trucks = connection.Query<Truck>(querySelect);
_logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(trucks));
return trucks;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при чтении объектов");
throw;
}
}
}

View File

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