From 973ec5d31ceab68c1c2e70f721988a1444d826a0 Mon Sep 17 00:00:00 2001
From: Daniya_Youdakova <dyudakova@mail.ru>
Date: Sun, 25 Dec 2022 17:19:27 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1-7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AircraftCarrier/AbstractMap.cs            |  4 ++++
 .../AircraftCarrier/AircraftCarrier.csproj    | 23 +++++++++++++++++++
 .../AircraftCarrierNotFoundException.cs       | 20 ++++++++++++++++
 .../AircraftCarrier/appsettings.json          | 14 +++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 AircraftCarrier/AircraftCarrier/AircraftCarrierNotFoundException.cs
 create mode 100644 AircraftCarrier/AircraftCarrier/appsettings.json

diff --git a/AircraftCarrier/AircraftCarrier/AbstractMap.cs b/AircraftCarrier/AircraftCarrier/AbstractMap.cs
index be3e887..b0946f6 100644
--- a/AircraftCarrier/AircraftCarrier/AbstractMap.cs
+++ b/AircraftCarrier/AircraftCarrier/AbstractMap.cs
@@ -70,6 +70,7 @@ namespace AircraftCarrier
                     yNumOfCells = (int)Math.Ceiling(_drawningObject.Step / _size_y);
                     xObjOffset = (int)(Left / _size_x);
                     yObjOffset = (int)Math.Ceiling(Bottom / _size_y);
+
                     for (int i = 0; i < yNumOfCells; i++)
                     {
                         if (!roadIsClear)
@@ -90,6 +91,7 @@ namespace AircraftCarrier
                         }
                     }
                     break;
+
                 case Direction.Left:
                     xNumOfCells = (int)Math.Ceiling(_drawningObject.Step / _size_x);
                     yNumOfCells = (int)Math.Ceiling((Bottom - Top) / _size_y);
@@ -116,6 +118,7 @@ namespace AircraftCarrier
                         }
                     }
                     break;
+
                 case Direction.Right:
                     xNumOfCells = (int)Math.Ceiling(_drawningObject.Step / _size_x);
                     yNumOfCells = (int)Math.Ceiling((Bottom - Top) / _size_y);
@@ -162,6 +165,7 @@ namespace AircraftCarrier
             int yNumOfCells = (int)Math.Ceiling(Bottom / _size_y) - (int)Math.Floor(Top / _size_y);
             int xObjOffset = (int)(x / _size_x);
             int yObjOffset = (int)(y / _size_y);
+
             while (y < _height - (Bottom - Top))
             {
                 while (x < _width - (Right - Left))
diff --git a/AircraftCarrier/AircraftCarrier/AircraftCarrier.csproj b/AircraftCarrier/AircraftCarrier/AircraftCarrier.csproj
index 13ee123..8b2ac69 100644
--- a/AircraftCarrier/AircraftCarrier/AircraftCarrier.csproj
+++ b/AircraftCarrier/AircraftCarrier/AircraftCarrier.csproj
@@ -8,6 +8,29 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="appsettings.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  
+  <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.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
+    <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
diff --git a/AircraftCarrier/AircraftCarrier/AircraftCarrierNotFoundException.cs b/AircraftCarrier/AircraftCarrier/AircraftCarrierNotFoundException.cs
new file mode 100644
index 0000000..afd57bc
--- /dev/null
+++ b/AircraftCarrier/AircraftCarrier/AircraftCarrierNotFoundException.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AircraftCarrier
+{
+    [Serializable]
+    internal class AircraftCarrierNotFoundException: ApplicationException
+    {
+        public AircraftCarrierNotFoundException(int i) : base($"Не найден объект по позиции{ i}") { }
+        public AircraftCarrierNotFoundException() : base() { }
+        public AircraftCarrierNotFoundException(string message) : base(message) { }
+        public AircraftCarrierNotFoundException(string message, Exception exception) : base(message, exception)
+        { }
+        protected AircraftCarrierNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}
\ No newline at end of file
diff --git a/AircraftCarrier/AircraftCarrier/appsettings.json b/AircraftCarrier/AircraftCarrier/appsettings.json
new file mode 100644
index 0000000..de776a1
--- /dev/null
+++ b/AircraftCarrier/AircraftCarrier/appsettings.json
@@ -0,0 +1,14 @@
+{
+  "Serilog": {
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "./Logs/program_log.log",
+          "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}] {Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file