Merge branch 'LabWork07' into LabWork08

Airbus/Airbus/AbstractMap.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    internal abstract class AbstractMap
+    internal abstract class AbstractMap : IEquatable<AbstractMap>
     {
         private IDrawningObject _drawningObject = null;
 
@@ -118,5 +118,32 @@ namespace Airbus
         protected abstract void GenerateMap();
         protected abstract void DrawRoadPart(Graphics g, int i, int j);
         protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+
+        public bool Equals(AbstractMap? other)
+        {
+            if (other == null ||
+                _map != other._map ||
+                _width != other._width ||
+                _size_x != other._size_x ||
+                _size_y != other._size_y ||
+                _height != other._height ||
+                GetType() != other.GetType() ||
+                _map.GetLength(0) != other._map.GetLength(0) ||
+                _map.GetLength(1) != other._map.GetLength(1))
+            {
+                return false;
+            }
+            for (int i = 0; i < _map.GetLength(0); i++)
+            {
+                for (int j = 0; j < _map.GetLength(1); j++)
+                {
+                    if (_map[i, j] != other._map[i, j])
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
     }
 }

Airbus/Airbus/Airbus.csproj

@@ -8,4 +8,23 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Settings.Delegates" Version="1.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
+	<ItemGroup>
+		<None Update="appsettings.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 </Project>

Airbus/Airbus/AirplaneCompareByColor.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class AirplaneCompareByColor : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xAirplane = x as DrawningObjectAirplane;
+            var yAirplane = y as DrawningObjectAirplane;
+            if (xAirplane == null && yAirplane == null)
+            {
+                return 0;
+            }
+            if (xAirplane == null && yAirplane != null)
+            {
+                return 1;
+            }
+            if (xAirplane != null && yAirplane == null)
+            {
+                return -1;
+            }
+            string xAirplaneColor = xAirplane.GetAirplane.airplane.BodyColor.Name;
+            string yAirplaneColor = yAirplane.GetAirplane.airplane.BodyColor.Name;
+            if (xAirplaneColor != yAirplaneColor)
+            {
+                return xAirplaneColor.CompareTo(yAirplaneColor);
+            }
+            if (xAirplane.GetAirplane.airplane is EntityAirbus xAirbus && yAirplane.GetAirplane.airplane is EntityAirbus yAirbus)
+            {
+                string xAirplaneDopColor = xAirbus.DopColor.Name;
+                string yAirplaneDopColor = yAirbus.DopColor.Name;
+                var dopColorCompare = xAirplaneDopColor.CompareTo(yAirplaneDopColor);
+                if (dopColorCompare != 0)
+                {
+                    return dopColorCompare;
+                }
+            }
+            var speedCompare = xAirplane.GetAirplane.airplane.Speed.CompareTo(yAirplane.GetAirplane.airplane.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xAirplane.GetAirplane.airplane.Weight.CompareTo(yAirplane.GetAirplane.airplane.Weight);
+        }
+    }
+}

Airbus/Airbus/AirplaneCompareByType.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class AirplaneCompareByType : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xAirplane = x as DrawningObjectAirplane;
+            var yAirplane = y as DrawningObjectAirplane;
+            if (xAirplane == null && yAirplane == null)
+            {
+                return 0;
+            }
+            if (xAirplane == null && yAirplane != null)
+            {
+                return 1;
+            }
+            if (xAirplane != null && yAirplane == null)
+            {
+                return -1;
+            }
+            if (xAirplane.GetAirplane.GetType().Name != yAirplane.GetAirplane.GetType().Name)
+            {
+                if (xAirplane.GetAirplane.GetType().Name == "DrawningAirplane")
+                {
+                    return -1;
+                }
+                return 1;
+            }
+            var speedCompare =
+            xAirplane.GetAirplane.airplane.Speed.CompareTo(yAirplane.GetAirplane.airplane.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xAirplane.GetAirplane.airplane.Weight.CompareTo(yAirplane.GetAirplane.airplane.Weight);
+        }
+    }
+}

Airbus/Airbus/AirplaneNotFoundException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class AirplaneNotFoundException : ApplicationException
+    {
+        public AirplaneNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
+        public AirplaneNotFoundException() : base() { }
+        public AirplaneNotFoundException(string message) : base(message) { }
+        public AirplaneNotFoundException(string message, Exception exception) : base(message, exception)
+        { }
+        protected AirplaneNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

Airbus/Airbus/DrawningObjectAirplane.cs

@@ -14,6 +14,7 @@ namespace Airbus
         {
             _airplane = airplane;
         }
+        public DrawningAirplane GetAirplane => _airplane;
         public float Step => _airplane?.airplane?.Step ?? 0;
         public void DrawningObject(Graphics g)
         {
@@ -27,7 +28,7 @@ namespace Airbus
         {
             _airplane?.MoveTransport(direction);
         }
-        public void SetObject(int x, int y, int width, int height)
+        public void SetObject(int x, int y, int width, int height)  
         {
             _airplane?.SetPosition(x, y, width, height);
         }
@@ -35,5 +36,52 @@ namespace Airbus
         public string GetInfo() => _airplane?.GetDataForSave();
         public static IDrawningObject Create(string data) => new DrawningObjectAirplane(data.CreateDrawningAirplane());
 
+        public bool Equals(IDrawningObject? other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+            var otherAirplane = other as DrawningObjectAirplane;
+            if (otherAirplane == null)
+            {
+                return false;
+            }
+            var airplane = _airplane.airplane;
+            var otherAirplaneAirplane = otherAirplane._airplane.airplane;
+            if (airplane.GetType() != otherAirplaneAirplane.GetType())
+            {
+                return false;
+            }
+            if (airplane.Speed != otherAirplaneAirplane.Speed)
+            {
+                return false;
+            }
+            if (airplane.Weight != otherAirplaneAirplane.Weight)
+            {
+                return false;
+            }
+            if (airplane.BodyColor != otherAirplaneAirplane.BodyColor)
+            {
+                return false;
+            }
+
+            if (airplane is EntityAirbus airbus && otherAirplaneAirplane is EntityAirbus otherAirbus)
+            {
+                if (airbus.DopColor != otherAirbus.DopColor)
+                {
+                    return false;
+                }
+                if (airbus.Engine != otherAirbus.Engine)
+                {
+                    return false;
+                }
+                if (airbus.Compartment != otherAirbus.Compartment)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
     }
 }

Airbus/Airbus/FormMapWithSetAirplane.Designer.cs

@@ -51,6 +51,8 @@
             this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
             this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+            this.buttonSortByType = new System.Windows.Forms.Button();
+            this.buttonSortByColor = new System.Windows.Forms.Button();
             this.groupBoxTools.SuspendLayout();
             this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
@@ -59,6 +61,8 @@
             // 
             // groupBoxTools
             // 
+            this.groupBoxTools.Controls.Add(this.buttonSortByColor);
+            this.groupBoxTools.Controls.Add(this.buttonSortByType);
             this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.buttonDown);
             this.groupBoxTools.Controls.Add(this.buttonRight);
@@ -267,14 +271,14 @@
             // SaveToolStripMenuItem
             // 
             this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.SaveToolStripMenuItem.Text = "Сохранение";
             this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
             // 
             // LoadToolStripMenuItem
             // 
             this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.LoadToolStripMenuItem.Text = "Загрузка";
             this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
             // 
@@ -286,6 +290,26 @@
             // 
             this.saveFileDialog.Filter = "txt file | *.txt";
             // 
+            // buttonSortByType
+            // 
+            this.buttonSortByType.Location = new System.Drawing.Point(12, 326);
+            this.buttonSortByType.Name = "buttonSortByType";
+            this.buttonSortByType.Size = new System.Drawing.Size(83, 38);
+            this.buttonSortByType.TabIndex = 11;
+            this.buttonSortByType.Text = "Сортировать по типу";
+            this.buttonSortByType.UseVisualStyleBackColor = true;
+            this.buttonSortByType.Click += new System.EventHandler(this.buttonSortByType_Click);
+            // 
+            // buttonSortByColor
+            // 
+            this.buttonSortByColor.Location = new System.Drawing.Point(101, 326);
+            this.buttonSortByColor.Name = "buttonSortByColor";
+            this.buttonSortByColor.Size = new System.Drawing.Size(93, 38);
+            this.buttonSortByColor.TabIndex = 12;
+            this.buttonSortByColor.Text = "Сортировать по цвету";
+            this.buttonSortByColor.UseVisualStyleBackColor = true;
+            this.buttonSortByColor.Click += new System.EventHandler(this.buttonSortByColor_Click);
+            // 
             // FormMapWithSetAirplane
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -334,5 +358,7 @@
         private ToolStripMenuItem LoadToolStripMenuItem;
         private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

Airbus/Airbus/FormMapWithSetAirplane.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using static System.Windows.Forms.DataFormats;
+using Microsoft.Extensions.Logging;
 
 namespace Airbus
 {
@@ -24,10 +25,12 @@ namespace Airbus
         /// <summary>
         /// Конструктор
         /// </summary>
-        public FormMapWithSetAirplane()
+        private readonly ILogger _logger;
+        public FormMapWithSetAirplane(ILogger<FormMapWithSetAirplane> logger)
         {
             InitializeComponent();
             _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            _logger = logger;
             comboBoxSelectorMap.Items.Clear();
             foreach (var elem in _mapsDict)
             {
@@ -61,22 +64,30 @@ namespace Airbus
             {
                 MessageBox.Show("Не все данные заполнены", "Ошибка",
                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogInformation("При добавлении карты {0}", comboBoxSelectorMap.SelectedIndex == -1 ? " Не все данные заполнены " : "Не была названа карта");
+
                 return;
             }
             if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
             {
                 MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK,
                MessageBoxIcon.Error);
+                _logger.LogWarning("Нет такой карты {0}", textBoxNewMapName.Text);
+
                 return;
             }
             _mapsCollection.AddMap(textBoxNewMapName.Text,
            _mapsDict[comboBoxSelectorMap.Text]);
             ReloadMaps();
+            _logger.LogInformation("Добавлена карта {0}", textBoxNewMapName.Text);
+
         }
         private void listBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
         {
             pictureBox.Image =
            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            _logger.LogInformation("Был осуществлен переход на карту под названием: {0}", listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+
         }
         private void buttonDelMap_Click(object sender, EventArgs e)
         {
@@ -89,6 +100,8 @@ namespace Airbus
             {
                 _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ??
                string.Empty);
+                _logger.LogInformation("Удалена карта {0}", listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+
                 ReloadMaps();
             }
         }
@@ -105,19 +118,32 @@ namespace Airbus
         }
         private void AddAirplane(DrawningAirplane airplane)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            try
             {
-                return;
+                if (listBoxMaps.SelectedIndex == -1)
+                {
+                    _logger.LogInformation("Попытка добавить объект, без создания карты");
+                    return;
+
+                }
+                DrawningObjectAirplane objectAirplane = new(airplane);
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + objectAirplane != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    _logger.LogInformation("Добавлен объект {@Airplane}", airplane);
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить ");
+                    _logger.LogInformation("Не удалось добавить объект");
+
+                }
             }
-            DrawningObjectAirplane objectAirplane = new(airplane);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + objectAirplane != -1)
+            catch (StorageOverflowException ex)
             {
-                MessageBox.Show("Объект добавлен");
-                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось добавить ");
+                _logger.LogWarning("Ошибка переполнения хранилища: {0}", ex.Message);
+                MessageBox.Show($"Ошибка переполнения хранилища: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
@@ -137,16 +163,32 @@ namespace Airbus
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ??
-           string.Empty] - pos != null)
+            try
             {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image =
-               _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ??
+               string.Empty] - pos != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    _logger.LogInformation("Удален объект {0}", _mapsCollection[listBoxMaps.SelectedItem?.ToString()]);
+                    pictureBox.Image =
+                   _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    
+                }
+                else
+                {
+                    _logger.LogInformation("Не удалось удалить объект");
+
+                    MessageBox.Show("Не удалось удалить объект");
+                }
             }
-            else
+            catch (AirplaneNotFoundException ex)
             {
-                MessageBox.Show("Не удалось удалить объект");
+                _logger.LogWarning("Ошибка удаления: {0}", ex.Message);
+                MessageBox.Show($"Ошибка удаления: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
             }
         }
         private void buttonStorage_Click(object sender, EventArgs e)
@@ -179,15 +221,22 @@ namespace Airbus
         {
             if (saveFileDialog.ShowDialog() == DialogResult.OK)
             {
-                if (_mapsCollection.SaveData(saveFileDialog.FileName))
+                try
                 {
+                    _mapsCollection.SaveData(saveFileDialog.FileName);
+                    _logger.LogInformation("Сохранение прошло успешно. Файл находится: {0}", saveFileDialog.FileName);
+
                     MessageBox.Show("Сохранение прошло успешно", "Результат",
-                   MessageBoxButtons.OK, MessageBoxIcon.Information);
+                   MessageBoxButtons.OK, MessageBoxIcon.    Information);
+
+
                 }
-                else
+                catch(Exception ex)
                 {
                     MessageBox.Show("Не сохранилось", "Результат",
                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning("Не удалось сохранить файл '{0}'. Текст ошибки: {1}", saveFileDialog.FileName, ex.Message);
+
                 }
             }
         }
@@ -200,13 +249,17 @@ namespace Airbus
         {
             if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                if (_mapsCollection.LoadData(openFileDialog.FileName))
+                try
                 {
+                    _mapsCollection.LoadData(openFileDialog.FileName);
                     ReloadMaps();
+                    _logger.LogInformation("Файл '{0}' успешно загружен", openFileDialog.FileName);
+
                     MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
-                else
+                catch (Exception ex)
                 {
+                    _logger.LogWarning("Не получилось загрузить файл. Текст ошибки: {1}", ex.Message);
                     MessageBox.Show("Не получилось загрузить файл", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             }
@@ -243,5 +296,27 @@ namespace Airbus
             pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
 
         }
+
+        private void buttonSortByType_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ??
+           string.Empty].Sort(new AirplaneCompareByType());
+            pictureBox.Image =
+           _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+
+        private void buttonSortByColor_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new AirplaneCompareByColor());
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
     }
 }

Airbus/Airbus/IDrawningObject.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    internal interface IDrawningObject
+    internal interface IDrawningObject : IEquatable<IDrawningObject>
     {
         public float Step { get; }
         void SetObject(int x, int y, int width, int height);

Airbus/Airbus/MapWithSetAirplaneGeneric.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace Airbus
 {
     internal class MapWithSetAirplaneGeneric<T, U>
-    where T : class, IDrawningObject
+    where T : class, IDrawningObject, IEquatable<T>
     where U : AbstractMap
     {
         /// <summary>
@@ -201,5 +201,9 @@ namespace Airbus
                 _setAirplane.Insert(DrawningObjectAirplane.Create(rec) as T);
             }
         }
+        public void Sort(IComparer<T> comparer)
+        {
+            _setAirplane.SortSet(comparer);
+        }
     }
 }

Airbus/Airbus/MapsCollection.cs

@@ -74,7 +74,7 @@ namespace Airbus
         /// </summary>
         /// <param name="filename">Путь и имя файла</param>
         /// <returns></returns>
-        public bool SaveData(string filename)
+        public void SaveData(string filename)
         {
             if (File.Exists(filename))
             {
@@ -88,18 +88,17 @@ namespace Airbus
                     sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
                 }
             }
-            return true;
         }
         /// <summary>
         /// Загрузка нформации по автомобилям на парковках из файла
         /// </summary>
         /// <param name="filename"></param>
         /// <returns></returns>
-        public bool LoadData(string filename)
+        public void LoadData(string filename)
         {
             if (!File.Exists(filename))
             {
-                return false;
+                throw new FileNotFoundException("Файл не найден");
             }
             using (StreamReader sr = new(filename))
             {
@@ -111,7 +110,7 @@ namespace Airbus
                     {
                         if (!str.Contains("MapsCollection"))
                         {
-                            return false;
+                            throw new FileFormatException("Формат данных в файле не правильный");
                         }
                         else
                         {
@@ -139,7 +138,6 @@ namespace Airbus
                         _mapStorages[tempElem[0]].LoadData(tempElem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
                     }
                 }
-                return true;
             }
         }
     }

Airbus/Airbus/Program.cs

@@ -1,3 +1,9 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System;
+using Serilog;
+
 namespace Airbus
 {
     internal static class Program
@@ -11,7 +17,30 @@ namespace Airbus
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMapWithSetAirplane());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetAirplane>());
+            }
+        }
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormMapWithSetAirplane>()
+            .AddLogging(option =>
+            {
+                var configuration = new ConfigurationBuilder()
+                    .SetBasePath(Directory.GetCurrentDirectory())
+                    .AddJsonFile(path: "appsettings.json", optional: false, reloadOnChange: true)
+                    .Build();
+
+                var logger = new LoggerConfiguration()
+                    .ReadFrom.Configuration(configuration)
+                    .CreateLogger();
+
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(logger);
+            });
         }
     }
 }

Airbus/Airbus/SetAirplaneGeneric.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace Airbus
 {
     internal class SetAirplaneGeneric<T>
-        where T : class
+        where T : class, IEquatable<T>
     {
         private readonly List<T> _places;
         public int Count => _places.Count;
@@ -24,6 +24,12 @@ namespace Airbus
 
         public int Insert(T airplane, int position)
         {
+            if (_places.Contains(airplane))
+            {
+                return -1;
+            }
+            if (Count == _maxCount)
+                throw new StorageOverflowException(_maxCount);
             if (position < 0 || position > _places.Count) return -1;
             _places.Insert(position, airplane);
             return position;
@@ -35,10 +41,13 @@ namespace Airbus
         /// <returns></returns>
         public T Remove(int position)
         {
+
             if (0 > position && position >= Count)
                 return null;
             T delobj = _places[position];
             _places[position] = null;
+            if (delobj == null)
+                throw new AirplaneNotFoundException(position);
             return delobj;
         }
         /// <summary>
@@ -63,11 +72,11 @@ namespace Airbus
         }
         public IEnumerable<T> GetAirplanes()
         {
-            foreach (var car in _places)
+            foreach (var airplane in _places)
             {
-                if (car != null)
+                if (airplane != null)
                 {
-                    yield return car;
+                    yield return airplane;
                 }
                 else
                 {
@@ -75,6 +84,14 @@ namespace Airbus
                 }
             }
         }
+        public void SortSet(IComparer<T> comparer)
+        {
+            if (comparer == null)
+            {
+                return;
+            }
+            _places.Sort(comparer);
+        }
 
     }
 }

Airbus/Airbus/StorageOverflowException.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    [Serializable]
+    internal class StorageOverflowException : ApplicationException
+    {
+        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: { count}") { }
+        public StorageOverflowException() : base() { }
+        public StorageOverflowException(string message) : base(message) { }
+        public StorageOverflowException(string message, Exception exception) :
+       base(message, exception)
+        { }
+        protected StorageOverflowException(SerializationInfo info,
+       StreamingContext contex) : base(info, contex) { }
+    }
+}

Airbus/Airbus/appsettings.json

@@ -0,0 +1,16 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log_.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ]
+  }
+}