Рефакторинг

ITServiceManager/ITServiceManager/Entities/Service.cs

@@ -6,14 +6,16 @@ public class Service
 {
     public int Id { get; private set; }
     public ServiceType ServiceType { get; private set; }
+    public string ServiceName { get; private set; } = string.Empty;
     public string Description { get; private set; } = string.Empty;
 
-    public static Service CreateEntity(int id, ServiceType type, string description)
+    public static Service CreateEntity(int id, ServiceType type, string name, string description)
     {
         return new Service
         {
             Id = id,
             ServiceType = type,
+            ServiceName = name,
             Description = description
         };
     }

ITServiceManager/ITServiceManager/Forms/FormAppointment.cs

@@ -1,45 +1,45 @@
 using ITServiceManager.Entities;
 using ITServiceManager.Repositories;
 
-namespace ITServiceManager.Forms
+namespace ITServiceManager.Forms;
+
+public partial class FormAppointment : Form
 {
-    public partial class FormAppointment : Form
+    private readonly IAppointmentRepository _appointmentRepository;
+    private int? _appointmentId;
+    public int Id
     {
-        private readonly IAppointmentRepository _appointmentRepository;
+        set
-        private int? _appointmentId;
-        public int Id
         {
-            set
+            try
             {
-                try
+                var appointment =
+                _appointmentRepository.ReadAppointmentById(value);
+                if (appointment == null)
                 {
-                    var appointment =
+                    throw new
-                    _appointmentRepository.ReadAppointmentById(value);
+                    InvalidDataException(nameof(appointment));
-                    if (appointment == null)
-                    {
-                        throw new
-                        InvalidDataException(nameof(appointment));
-                    }
-                    comboBoxEmployee.SelectedItem = appointment.EmployeeId;
-                    comboBoxOrder.SelectedItem = appointment.OrderId;
-                    _appointmentId = value;
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
                 }
+                comboBoxEmployee.SelectedIndex = appointment.EmployeeId;
+                comboBoxOrder.SelectedIndex = appointment.OrderId;
+                _appointmentId = value;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
             }
         }
-        public FormAppointment(IAppointmentRepository appointmentRepository, IEmployeeRepository employeeRepository, IOrderRepository orderRepository)
+    }
-        {
+    public FormAppointment(IAppointmentRepository appointmentRepository, IEmployeeRepository employeeRepository, IOrderRepository orderRepository)
-            InitializeComponent();
+    {
-            _appointmentRepository = appointmentRepository ??
+        InitializeComponent();
-            throw new ArgumentNullException(nameof(appointmentRepository));
+        _appointmentRepository = appointmentRepository ??
+        throw new ArgumentNullException(nameof(appointmentRepository));
 
-            comboBoxOrder.DataSource = orderRepository.ReadOrders();
+        comboBoxOrder.DataSource = orderRepository.ReadOrders();
-            comboBoxOrder.DisplayMember = "Name";
+        comboBoxOrder.DisplayMember = "Name";
-            comboBoxOrder.ValueMember = "Id";
+        comboBoxOrder.ValueMember = "Id";
 
             comboBoxEmployee.DataSource = employeeRepository.ReadEmployees();
             comboBoxEmployee.DisplayMember = "Name";
@@ -50,47 +50,49 @@ namespace ITServiceManager.Forms
 
             dateTimePickerEnd.ValueChanged += DateTimePickerEnd_ValueChanged;
 
-        }
+    }
-
+    private void DateTimePickerEnd_ValueChanged(object sender, EventArgs e)
-        private void DateTimePickerEnd_ValueChanged(object sender, EventArgs e)
+    {
+        if (dateTimePickerEnd.CustomFormat == "В процессе")
         {
-            if (dateTimePickerEnd.CustomFormat == "В процессе")
+            dateTimePickerEnd.CustomFormat = "dd.MM.yyyy HH:mm";
-            {
-                dateTimePickerEnd.CustomFormat = "dd.MM.yyyy HH:mm"; 
-            }
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                if (comboBoxEmployee.SelectedIndex < 0 || comboBoxOrder.SelectedIndex < 0)
-                {
-                    throw new Exception("Имеются незаполненные поля");
-                }
-
-                if (_appointmentId.HasValue)
-                {
-                    _appointmentRepository.UpdateAppointment(CreateAppointment(_appointmentId.Value));
-                }
-                else
-                {
-                    _appointmentRepository.CreateAppointment(CreateAppointment(0));
-                }
-                Close();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при сохранении",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonCancel_Click(object sender, EventArgs e) => Close();
-        private Appointment CreateAppointment(int id)
-        {
-            DateTime? endDate = dateTimePickerEnd.CustomFormat == "В процессе" ? (DateTime?)null : dateTimePickerEnd.Value;
-
-           return Appointment.CreateOperation(id, (int)comboBoxOrder.SelectedValue!, (int)comboBoxEmployee.SelectedValue!, Convert.ToDateTime(dateTimePickerStart.Value),
-           endDate);
         }
     }
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            if (comboBoxEmployee.SelectedIndex < 0 || comboBoxOrder.SelectedIndex < 0)
+            {
+                throw new Exception("Имеются незаполненные поля");
+            }
+
+            if (_appointmentId.HasValue)
+            {
+                _appointmentRepository.UpdateAppointment(CreateAppointment(_appointmentId.Value));
+            }
+            else
+            {
+                _appointmentRepository.CreateAppointment(CreateAppointment(0));
+            }
+            Close();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при сохранении",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+
+    private void ButtonCancel_Click(object sender, EventArgs e) => Close();
+
+    private Appointment CreateAppointment(int id)
+    {
+        DateTime? endDate = dateTimePickerEnd.CustomFormat == "В процессе" ? (DateTime?)null : dateTimePickerEnd.Value;
+
+        return Appointment.CreateOperation(id, (int)comboBoxOrder.SelectedValue!, (int)comboBoxEmployee.SelectedValue!, Convert.ToDateTime(dateTimePickerStart.Value),
+        endDate);
+    }
+
 }
+

ITServiceManager/ITServiceManager/Forms/FormAppointments.Designer.cs

@@ -80,7 +80,6 @@
             buttonRemove.Size = new Size(86, 101);
             buttonRemove.TabIndex = 3;
             buttonRemove.UseVisualStyleBackColor = true;
-            buttonRemove.Click += buttonRemove_Click;
             // 
             // buttonUpdate
             // 

ITServiceManager/ITServiceManager/Forms/FormAppointments.cs

@@ -1,103 +1,71 @@
 using ITServiceManager.Repositories;
-using ITServiceManager.Repositories.Implementations;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Unity;
 
-namespace ITServiceManager.Forms
+namespace ITServiceManager.Forms;
-{
-    public partial class FormAppointments : Form
-    {
-        private readonly IUnityContainer _container;
-        private readonly IAppointmentRepository _appointmentRepository;
-        public FormAppointments(IUnityContainer container, IAppointmentRepository appointmentRepository)
-        {
-            InitializeComponent();
-            _container = container ?? throw new ArgumentNullException(nameof(container));
-            _appointmentRepository = appointmentRepository ?? throw new ArgumentNullException(nameof(appointmentRepository));
-        }
-        private void FormAppointments_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                _container.Resolve<FormAppointment>().ShowDialog();
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (!TryGetIdentifierFromSelectedRow(out var findId))
-            {
-                return;
-            }
-            try
-            {
-                var form = _container.Resolve<FormAppointment>();
-                form.Id = findId;
-                form.ShowDialog();
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при изменении",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void LoadList() => dataGridView.DataSource = _appointmentRepository.ReadAppointments();
-        private bool TryGetIdentifierFromSelectedRow(out int id)
-        {
-            id = 0;
-            if (dataGridView.SelectedRows.Count < 1)
-            {
-                MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return false;
-            }
-            id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-            return true;
-        }
 
-        private void buttonRemove_Click(object sender, EventArgs e)
+public partial class FormAppointments : Form
+{
+    private readonly IUnityContainer _container;
+    private readonly IAppointmentRepository _appointmentRepository;
+    public FormAppointments(IUnityContainer container, IAppointmentRepository appointmentRepository)
+    {
+        InitializeComponent();
+        _container = container ?? throw new ArgumentNullException(nameof(container));
+        _appointmentRepository = appointmentRepository ?? throw new ArgumentNullException(nameof(appointmentRepository));
+    }
+    private void FormAppointments_Load(object sender, EventArgs e)
+    {
+        try
         {
-            if (!TryGetIdentifierFromSelectedRow(out var findId))
+            LoadList();
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-            {
-                return;
-            }
-            try
-            {
-                _appointmentRepository.DeleteAppointment(findId);
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
         }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            _container.Resolve<FormAppointment>().ShowDialog();
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void ButtonUpd_Click(object sender, EventArgs e)
+    {
+        if (!TryGetIdentifierFromSelectedRow(out var findId))
+        {
+            return;
+        }
+        try
+        {
+            var form = _container.Resolve<FormAppointment>();
+            form.Id = findId;
+            form.ShowDialog();
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при изменении",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void LoadList() => dataGridView.DataSource = _appointmentRepository.ReadAppointments();
+    private bool TryGetIdentifierFromSelectedRow(out int id)
+    {
+        id = 0;
+        if (dataGridView.SelectedRows.Count < 1)
+        {
+            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return false;
+        }
+        id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+        return true;
     }
 }
 

ITServiceManager/ITServiceManager/Forms/FormCompanies.cs

@@ -1,106 +1,96 @@
 using ITServiceManager.Repositories;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Unity;
 
-namespace ITServiceManager.Forms
+namespace ITServiceManager.Forms;
+
+public partial class FormCompanies : Form
 {
-    public partial class FormCompanies : Form
+    private readonly IUnityContainer _container;
+    private readonly ICompanyRepository _companyRepository;
+
+    public FormCompanies(IUnityContainer container, ICompanyRepository companyRepository)
     {
-        private readonly IUnityContainer _container;
+        InitializeComponent();
-        private readonly ICompanyRepository _companyRepository;
+        _container = container ?? throw new ArgumentNullException(nameof(container));
-
+        _companyRepository = companyRepository ?? throw new ArgumentNullException(nameof(companyRepository));
-        public FormCompanies(IUnityContainer container, ICompanyRepository companyRepository)
+    }
+    private void FormCompanies_Load(object sender, EventArgs e)
+    {
+        try
         {
-            InitializeComponent();
+            LoadList();
-            _container = container ?? throw new ArgumentNullException(nameof(container));
-            _companyRepository = companyRepository ?? throw new ArgumentNullException(nameof(companyRepository));
         }
-        private void FormCompanies_Load(object sender, EventArgs e)
+        catch (Exception ex)
         {
-            try
+            MessageBox.Show(ex.Message, "Ошибка при загрузке",
-            {
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при загрузке",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                _container.Resolve<FormCompany>().ShowDialog();
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonRemove_Click(object sender, EventArgs e)
-        {
-            if (!TryGetIdentifierFromSelectedRow(out var findId))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-            {
-                return;
-            }
-            try
-            {
-                _companyRepository.DeleteCompany(findId);
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonUpdate_Click(object sender, EventArgs e)
-        {
-            if (!TryGetIdentifierFromSelectedRow(out var findId))
-            {
-                return;
-            }
-            try
-            {
-                var form = _container.Resolve<FormCompany>();
-                form.Id = findId;
-                form.ShowDialog();
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при изменении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void LoadList() => dataGridView.DataSource = _companyRepository.ReadCompanies();
-        private bool TryGetIdentifierFromSelectedRow(out int id)
-        {
-            id = 0;
-            if (dataGridView.SelectedRows.Count < 1)
-            {
-                MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return false;
-            }
-            id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-            return true;
-        }
-
-        private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-
         }
     }
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            _container.Resolve<FormCompany>().ShowDialog();
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void ButtonRemove_Click(object sender, EventArgs e)
+    {
+        if (!TryGetIdentifierFromSelectedRow(out var findId))
+        {
+            return;
+        }
+        if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
+        {
+            return;
+        }
+        try
+        {
+            _companyRepository.DeleteCompany(findId);
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void ButtonUpdate_Click(object sender, EventArgs e)
+    {
+        if (!TryGetIdentifierFromSelectedRow(out var findId))
+        {
+            return;
+        }
+        try
+        {
+            var form = _container.Resolve<FormCompany>();
+            form.Id = findId;
+            form.ShowDialog();
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при изменении", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void LoadList() => dataGridView.DataSource = _companyRepository.ReadCompanies();
+    private bool TryGetIdentifierFromSelectedRow(out int id)
+    {
+        id = 0;
+        if (dataGridView.SelectedRows.Count < 1)
+        {
+            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return false;
+        }
+        id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+        return true;
+    }
+
+    private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
+    {
+
+    }
 }

ITServiceManager/ITServiceManager/Forms/FormEmployees.cs

@@ -1,117 +1,105 @@
 using ITServiceManager.Repositories;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Unity;
 
-namespace ITServiceManager.Forms
+namespace ITServiceManager.Forms;
+
+public partial class FormEmployees : Form
 {
-    public partial class FormEmployees : Form
+    private readonly IUnityContainer _container;
+    private readonly IEmployeeRepository _employeeRepository;
+    public FormEmployees(IUnityContainer container, IEmployeeRepository
+    employeeRepository)
     {
-        private readonly IUnityContainer _container;
+        InitializeComponent();
-        private readonly IEmployeeRepository _employeeRepository;
+        _container = container ??
-        public FormEmployees(IUnityContainer container, IEmployeeRepository
+        throw new ArgumentNullException(nameof(container));
-        employeeRepository)
+        _employeeRepository = employeeRepository ??
-        {
+        throw new
-            InitializeComponent();
+        ArgumentNullException(nameof(employeeRepository));
-            _container = container ??
-            throw new ArgumentNullException(nameof(container));
-            _employeeRepository = employeeRepository ??
-            throw new
-            ArgumentNullException(nameof(employeeRepository));
-        }
-        private void FormEmployees_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при загрузке",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                _container.Resolve<FormEmployee>().ShowDialog();
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при добавлении",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (!TryGetIdentifierFromSelectedRow(out var findId))
-            {
-                return;
-            }
-            try
-            {
-                var form = _container.Resolve<FormEmployee>();
-                form.Id = findId;
-                form.ShowDialog();
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при изменении",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonDel_Click(object sender, EventArgs e)
-        {
-            if (!TryGetIdentifierFromSelectedRow(out var findId))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить запись?", "Удаление",
-            MessageBoxButtons.YesNo) != DialogResult.Yes)
-            {
-                return;
-            }
-            try
-            {
-                _employeeRepository.DeleteEmployee(findId);
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при удалении",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void LoadList() => dataGridView.DataSource =
-        _employeeRepository.ReadEmployees();
-        private bool TryGetIdentifierFromSelectedRow(out int id)
-        {
-            id = 0;
-            if (dataGridView.SelectedRows.Count < 1)
-            {
-                MessageBox.Show("Нет выбранной записи", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return false;
-            }
-            id =
-            Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-            return true;
-        }
-
-
-
     }
+    private void FormEmployees_Load(object sender, EventArgs e)
+    {
+        try
+        {
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при загрузке",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            _container.Resolve<FormEmployee>().ShowDialog();
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при добавлении",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+
+    private void ButtonUpd_Click(object sender, EventArgs e)
+    {
+        if (!TryGetIdentifierFromSelectedRow(out var findId))
+        {
+            return;
+        }
+        try
+        {
+            var form = _container.Resolve<FormEmployee>();
+            form.Id = findId;
+            form.ShowDialog();
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при изменении",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+
+    private void ButtonDel_Click(object sender, EventArgs e)
+    {
+        if (!TryGetIdentifierFromSelectedRow(out var findId))
+        {
+            return;
+        }
+        if (MessageBox.Show("Удалить запись?", "Удаление",
+        MessageBoxButtons.YesNo) != DialogResult.Yes)
+        {
+            return;
+        }
+        try
+        {
+            _employeeRepository.DeleteEmployee(findId);
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при удалении",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void LoadList() => dataGridView.DataSource =
+    _employeeRepository.ReadEmployees();
+    private bool TryGetIdentifierFromSelectedRow(out int id)
+    {
+        id = 0;
+        if (dataGridView.SelectedRows.Count < 1)
+        {
+            MessageBox.Show("Нет выбранной записи", "Ошибка",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return false;
+        }
+        id =
+        Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+        return true;
+    }
+
 }

ITServiceManager/ITServiceManager/Forms/FormOrder.cs

@@ -1,5 +1,6 @@
 using ITServiceManager.Entities;
 using ITServiceManager.Repositories;
+
 namespace ITServiceManager.Forms;
 
 public partial class FormOrder : Form
@@ -15,7 +16,7 @@ public partial class FormOrder : Form
         comboBoxCompany.ValueMember = "Id";
 
         ColumnService.DataSource = serviceRepository.ReadServices();
-        ColumnService.DisplayMember = "ServiceType";
+        ColumnService.DisplayMember = "ServiceName";
         ColumnService.ValueMember = "Id";
 
     }

ITServiceManager/ITServiceManager/Forms/FormOrders.cs

@@ -1,81 +1,71 @@
 using ITServiceManager.Repositories;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Unity;
 
-namespace ITServiceManager.Forms
+namespace ITServiceManager.Forms;
+
+public partial class FormOrders : Form
 {
-    public partial class FormOrders : Form
+    private readonly IUnityContainer _container;
+    private readonly IOrderRepository _orderRepository;
+    public FormOrders(IUnityContainer container, IOrderRepository orderRepository)
     {
-        private readonly IUnityContainer _container;
+        InitializeComponent();
-        private readonly IOrderRepository _orderRepository;
+        _container = container ?? throw new ArgumentNullException(nameof(container));
-        public FormOrders(IUnityContainer container, IOrderRepository orderRepository)
+        _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));
+    }
+    private void FormOrders_Load(object sender, EventArgs e)
+    {
+        try
         {
-            InitializeComponent();
+            LoadList();
-            _container = container ?? throw new ArgumentNullException(nameof(container));
-            _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));
         }
-        private void FormOrders_Load(object sender, EventArgs e)
+        catch (Exception ex)
         {
-            try
+            MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            {
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                _container.Resolve<FormOrder>().ShowDialog();
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonRemove_Click(object sender, EventArgs e)
-        {
-            if (!TryGetIdentifierFromSelectedRow(out var findId))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-            {
-                return;
-            }
-            try
-            {
-                _orderRepository.DeleteOrder(findId);
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void LoadList() => dataGridView.DataSource = _orderRepository.ReadOrders();
-        private bool TryGetIdentifierFromSelectedRow(out int id)
-        {
-            id = 0;
-            if (dataGridView.SelectedRows.Count < 1)
-            {
-                MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return false;
-            }
-            id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-            return true;
         }
     }
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            _container.Resolve<FormOrder>().ShowDialog();
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void ButtonRemove_Click(object sender, EventArgs e)
+    {
+        if (!TryGetIdentifierFromSelectedRow(out var findId))
+        {
+            return;
+        }
+        if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
+        {
+            return;
+        }
+        try
+        {
+            _orderRepository.DeleteOrder(findId);
+            LoadList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+    private void LoadList() => dataGridView.DataSource = _orderRepository.ReadOrders();
+    private bool TryGetIdentifierFromSelectedRow(out int id)
+    {
+        id = 0;
+        if (dataGridView.SelectedRows.Count < 1)
+        {
+            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return false;
+        }
+        id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+        return true;
+    }
 }

ITServiceManager/ITServiceManager/Forms/FormService.Designer.cs

@@ -34,12 +34,13 @@
             label1 = new Label();
             label2 = new Label();
             checkedListBoxType = new CheckedListBox();
+            textBoxName = new TextBox();
+            labelName = new Label();
             SuspendLayout();
             // 
             // buttonCancel
             // 
-            buttonCancel.Location = new Point(358, 367);
+            buttonCancel.Location = new Point(310, 318);
-            buttonCancel.Margin = new Padding(3, 4, 3, 4);
             buttonCancel.Name = "buttonCancel";
             buttonCancel.Size = new Size(128, 37);
             buttonCancel.TabIndex = 7;
@@ -49,8 +50,7 @@
             // 
             // buttonAdd
             // 
-            buttonAdd.Location = new Point(99, 367);
+            buttonAdd.Location = new Point(84, 318);
-            buttonAdd.Margin = new Padding(3, 4, 3, 4);
             buttonAdd.Name = "buttonAdd";
             buttonAdd.Size = new Size(128, 37);
             buttonAdd.TabIndex = 6;
@@ -60,25 +60,26 @@
             // 
             // richTextBoxDescription
             // 
-            richTextBoxDescription.Location = new Point(278, 159);
+            richTextBoxDescription.Location = new Point(240, 207);
+            richTextBoxDescription.Margin = new Padding(3, 2, 3, 2);
             richTextBoxDescription.Name = "richTextBoxDescription";
-            richTextBoxDescription.Size = new Size(265, 175);
+            richTextBoxDescription.Size = new Size(232, 87);
             richTextBoxDescription.TabIndex = 9;
             richTextBoxDescription.Text = "";
             // 
             // label1
             // 
             label1.AutoSize = true;
-            label1.Location = new Point(68, 36);
+            label1.Location = new Point(57, 52);
             label1.Name = "label1";
-            label1.Size = new Size(83, 20);
+            label1.Size = new Size(67, 15);
             label1.TabIndex = 4;
             label1.Text = "Тип услуги";
             // 
             // label2
             // 
             label2.AutoSize = true;
-            label2.Location = new Point(52, 179);
+            label2.Location = new Point(57, 239);
             label2.Name = "label2";
             label2.Size = new Size(127, 20);
             label2.TabIndex = 8;
@@ -87,22 +88,42 @@
             // checkedListBoxType
             // 
             checkedListBoxType.FormattingEnabled = true;
-            checkedListBoxType.Location = new Point(278, 12);
+            checkedListBoxType.Location = new Point(240, 29);
+            checkedListBoxType.Margin = new Padding(3, 2, 3, 2);
             checkedListBoxType.Name = "checkedListBoxType";
-            checkedListBoxType.Size = new Size(265, 114);
+            checkedListBoxType.Size = new Size(232, 76);
             checkedListBoxType.TabIndex = 10;
             // 
+            // textBoxName
+            // 
+            textBoxName.Location = new Point(240, 142);
+            textBoxName.Name = "textBoxName";
+            textBoxName.Size = new Size(232, 23);
+            textBoxName.TabIndex = 11;
+            // 
+            // labelName
+            // 
+            labelName.AutoSize = true;
+            labelName.Location = new Point(57, 142);
+            labelName.Name = "labelName";
+            labelName.Size = new Size(59, 15);
+            labelName.TabIndex = 12;
+            labelName.Text = "Название";
+            // 
             // FormService
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(584, 451);
+            ClientSize = new Size(511, 362);
+            Controls.Add(labelName);
+            Controls.Add(textBoxName);
             Controls.Add(checkedListBoxType);
             Controls.Add(richTextBoxDescription);
             Controls.Add(label2);
             Controls.Add(buttonCancel);
             Controls.Add(buttonAdd);
             Controls.Add(label1);
+            Margin = new Padding(3, 2, 3, 2);
             Name = "FormService";
             StartPosition = FormStartPosition.CenterScreen;
             Text = "Услуга";
@@ -118,5 +139,7 @@
         private Label label1;
         private Label label2;
         private CheckedListBox checkedListBoxType;
+        private TextBox textBoxName;
+        private Label labelName;
     }
 }

ITServiceManager/ITServiceManager/Forms/FormService.cs

@@ -31,7 +31,7 @@ public partial class FormService : Form
                     }
                 }
 
-
+                textBoxName.Text = service.ServiceName;
                 richTextBoxDescription.Text = service.Description;
                 _serviceId = value;
             }
@@ -58,7 +58,7 @@ public partial class FormService : Form
         try
         {
             if (checkedListBoxType.CheckedItems.Count == 0 ||
-            string.IsNullOrWhiteSpace(richTextBoxDescription.Text))
+            string.IsNullOrWhiteSpace(richTextBoxDescription.Text) || string.IsNullOrWhiteSpace(textBoxName.Text))
             {
                 throw new Exception("Имеются незаполненные поля");
             }
@@ -87,6 +87,6 @@ public partial class FormService : Form
             serviceType |= (ServiceType)elem;
         }
 
-        return Service.CreateEntity(id, serviceType, richTextBoxDescription.Text);
+        return Service.CreateEntity(id, serviceType, textBoxName.Text, richTextBoxDescription.Text);
     }
 }

ITServiceManager/ITServiceManager/Program.cs

@@ -6,50 +6,49 @@ using Unity.Microsoft.Logging;
 using Serilog;
 using Unity;
 
-namespace ITServiceManager
+namespace ITServiceManager;
+
+internal static class Program
 {
-    internal static class Program
+    /// <summary>
+    ///  The main entry point for the application.
+    /// </summary>
+    [STAThread]
+    static void Main()
     {
-        /// <summary>
+        // To customize application configuration such as set high DPI settings or default font,
-        ///  The main entry point for the application.
+        // see https://aka.ms/applicationconfiguration.
-        /// </summary>
+        ApplicationConfiguration.Initialize();
-        [STAThread]
+        Application.Run(CreateContainer().Resolve<FormItCompany>());
-        static void Main()
-        {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            Application.Run(CreateContainer().Resolve<FormItCompany>());
        
-        }
-
-        private static IUnityContainer CreateContainer()
-        {
-            var container = new UnityContainer();
-
-            container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
-
-            container.RegisterType<IOrderRepository, OrderRepository>();
-            container.RegisterType<IAppointmentRepository, AppointmentRepository>();
-            container.RegisterType<IServiceRepository, ServiceRepository>();
-            container.RegisterType<IEmployeeRepository, EmployeeRepository>();
-            container.RegisterType<ICompanyRepository, CompanyRepository>();
-
-            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;
-        }
     }
+    private static IUnityContainer CreateContainer()
+    {
+        var container = new UnityContainer();
+
+        container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
+
+        container.RegisterType<IOrderRepository, OrderRepository>();
+        container.RegisterType<IAppointmentRepository, AppointmentRepository>();
+        container.RegisterType<IServiceRepository, ServiceRepository>();
+        container.RegisterType<IEmployeeRepository, EmployeeRepository>();
+        container.RegisterType<ICompanyRepository, CompanyRepository>();
+
+        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;
+    }
+
 }

ITServiceManager/ITServiceManager/Repositories/Implementations/ServiceRepository.cs

@@ -64,8 +64,8 @@ public class ServiceRepository : IServiceRepository
         {
             using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
             var queryInsert = @"
-                INSERT INTO Services (ServiceType, Description)
+                INSERT INTO Services (ServiceType, ServiceName, Description)
-                VALUES (@ServiceType, @Description)";
+                VALUES (@ServiceType, @ServiceName, @Description)";
             connection.Execute(queryInsert, service);
         }
         catch (Exception ex)
@@ -85,6 +85,7 @@ public class ServiceRepository : IServiceRepository
                 UPDATE Services
                 SET
                 ServiceType=@ServiceType,
+                ServiceName=@ServiceName,
                 Description=@Description
                 WHERE Id=@Id";
             connection.Execute(queryUpdate, service);