Merge branch 'experimental'

This reverts commit e462add7f3.

RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs

@@ -25,7 +25,7 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
             .AddSingleton<IAddInConfiguration, AddInConfiguration>()
             .AddSingleton<IDatabaseClient, DatabaseClient>()
             .AddSingleton<ICurrencyClient, CurrencyClient>()
-            .AddSingleton<ISleevesCalculator, SleevesCalculator>()
+            .AddSingleton<IFittingsCalculator, SleevesCalculator>()
             .AddTransient<IFileDialog, FileDialog>();
 
         Services.AddSingleton<WriterFactory>();

RhSolutions.AddIn/RhSolutions-AddIn.dna

@@ -1,32 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DnaLibrary Name="RhSolutions Add-In" RuntimeVersion="v4.0" xmlns="http://schemas.excel-dna.net/addin/2020/07/dnalibrary">
   <ExternalLibrary Path="RhSolutions.AddIn.dll" ExplicitExports="false" LoadFromBytes="true" Pack="true" IncludePdb="false" />
-	<Reference Path="ExcelDna.IntelliSense.dll" Pack="true" />
-	<Reference Path="Microsoft.AspNetCore.Http.Abstractions.dll" Pack="true" />
-	<Reference Path="Microsoft.AspNetCore.Http.Extensions.dll" Pack="true" />
-	<Reference Path="Microsoft.AspNetCore.Http.Features.dll" Pack="true" />
 	<Reference Path="Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" />
 	<Reference Path="Microsoft.Bcl.HashCode.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.Caching.Abstractions.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.Caching.Memory.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.DependencyInjection.Abstractions.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.DependencyInjection.dll" Pack="true" />
-	<Reference Path="Microsoft.Extensions.FileProviders.Abstractions.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.Http.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.Logging.Abstractions.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.Logging.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.Options.dll" Pack="true" />
 	<Reference Path="Microsoft.Extensions.Primitives.dll" Pack="true" />
-	<Reference Path="Microsoft.Net.Http.Headers.dll" Pack="true" />
-	<Reference Path="netDxf.dll" Pack="true" />
+	<Reference Path="ExcelDna.IntelliSense.dll" Pack="true" />
 	<Reference Path="Newtonsoft.Json.dll" Pack="true" />
+	<Reference Path="netDxf.dll" Pack="true" />
 	<Reference Path="RhSolutions.ProductSku.dll" Pack="true" />
 	<Reference Path="System.Buffers.dll" Pack="true" />
 	<Reference Path="System.Diagnostics.DiagnosticSource.dll" Pack="true" />
 	<Reference Path="System.Memory.dll" Pack="true" />
 	<Reference Path="System.Numerics.Vectors.dll" Pack="true" />
 	<Reference Path="System.Runtime.CompilerServices.Unsafe.dll" Pack="true" />
-	<Reference Path="System.Text.Encodings.Web.dll" Pack="true" />
 	<Reference Path="System.Threading.Tasks.Extensions.dll" Pack="true" />
 	<Reference Path="System.ValueTuple.dll" Pack="true" />	
 </DnaLibrary>

RhSolutions.AddIn/RhSolutions.AddIn.csproj

@@ -14,25 +14,24 @@
 		<StartupObject />
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
-		<NoWarn>1701;1702</NoWarn>
+	  <NoWarn>1701;1702</NoWarn>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
-		<NoWarn>1701;1702</NoWarn>
+	  <NoWarn>1701;1702</NoWarn>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows7.0|AnyCPU'">
-		<NoWarn>1701;1702</NoWarn>
+	  <NoWarn>1701;1702</NoWarn>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-windows7.0|AnyCPU'">
-		<NoWarn>1701;1702</NoWarn>
+	  <NoWarn>1701;1702</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="ExcelDna.AddIn" Version="1.6.0">
-			<TreatAsUsed>true</TreatAsUsed>
+		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
 		<PackageReference Include="ExcelDna.Integration" Version="1.6.0" />
 		<PackageReference Include="ExcelDna.IntelliSense" Version="1.6.0" />
 		<PackageReference Include="ExcelDna.Interop" Version="15.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

RhSolutions.AddIn/Services/CouplingsCalculator.cs

@@ -0,0 +1,9 @@
+namespace RhSolutions.Services;
+
+public class CouplingsCalculator : IFittingsCalculator
+{
+    public Dictionary<Product, double> Calculate(Dictionary<Product, double> products)
+    {
+        throw new NotImplementedException();
+    }
+}

RhSolutions.AddIn/Services/DatabaseClient.cs

@@ -1,10 +1,8 @@
 using Microsoft.Extensions.Caching.Memory;
 using Newtonsoft.Json;
-using System.Web;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http.Extensions;
 
 namespace RhSolutions.Services;
 
@@ -55,13 +53,13 @@ public class DatabaseClient : IDatabaseClient
         }
 
         else
-        {            
-            QueryBuilder qb = new()
+        {
+            UriBuilder builder = new(@"https://rh.cebotari.ru/api/search")
             {
-                {"query", line}
+                Query = $"query={line.Replace("&", "%26")}"
             };
-            string request = @"https://rh.cebotari.ru/api/search" + qb.ToQueryString();
-
+            string request = builder.Uri.AbsoluteUri;
+            
             if (!_memoryCache.TryGetValue(line, out IEnumerable<Product> products))
             {
                 var response = await _httpClient.GetAsync(request);

RhSolutions.AddIn/Services/IFittingsCalculator.cs

@@ -0,0 +1,6 @@
+namespace RhSolutions.Services;
+
+public interface IFittingsCalculator
+{
+    public Dictionary<Product, double> Calculate(Dictionary<Product, double> products);
+}

RhSolutions.AddIn/Services/ISleevesCalculator.cs

@@ -1,6 +0,0 @@
-namespace RhSolutions.Services;
-
-public interface ISleevesCalculator
-{
-    public Dictionary<Product, double> CalculateSleeves(Dictionary<Product, double> products);
-}

RhSolutions.AddIn/Services/SleevesCalculator.cs

@@ -2,14 +2,14 @@
 
 namespace RhSolutions.Services;
 
-public class SleevesCalculator : ISleevesCalculator
+public class SleevesCalculator : IFittingsCalculator
 {
     private const string doublePattern =
         @"((?i)равнопроходная|угольник\s+90|угольник\s+45|Т-образная|Комплект\s+трубок(?i))(.+?\b(?<Sleeve>16|20|25|32|40|50|63)\b)+";
     private const string singlePattern =
         @"((?i)муфта|тройник|переходник|угольник|штуцер|Г-образная|заглушка(?i))(.+?\b(?<Sleeve>16|20|25|32|40|50|63)\b)+";
 
-    public Dictionary<Product, double> CalculateSleeves(Dictionary<Product, double> products)
+    public Dictionary<Product, double> Calculate(Dictionary<Product, double> products)
     {
         Dictionary<string, double> result = new()
         {

RhSolutions.AddIn/Tools/SleevesTool.cs

@@ -2,9 +2,9 @@
 
 internal class SleevesTool : Tool
 {
-    private readonly ISleevesCalculator _sleevesCaluculator;
+    private readonly IFittingsCalculator _sleevesCaluculator;
 
-    public SleevesTool(ReaderFactory readerFactory, WriterFactory writerFactory, ISleevesCalculator sleevesCaluculator) : base(readerFactory, writerFactory)
+    public SleevesTool(ReaderFactory readerFactory, WriterFactory writerFactory, IFittingsCalculator sleevesCaluculator) : base(readerFactory, writerFactory)
     {
         _sleevesCaluculator = sleevesCaluculator;
     }
@@ -15,7 +15,7 @@ internal class SleevesTool : Tool
         Worksheet worksheet = app.ActiveWorkbook.ActiveSheet;
         _reader = _readerFactory.GetReader("Excel");
         var products = _reader.ReadProducts(new[] { worksheet });
-        var sleeves = _sleevesCaluculator.CalculateSleeves(products.Select(p => p.Item2).First());
+        var sleeves = _sleevesCaluculator.Calculate(products.Select(p => p.Item2).First());
         _writer = _writerFactory.GetWriter("CurrentPrice");
         _writer.WriteProducts(sleeves);
     }

RhSolutions.AddIn/Tools/ToolFactory.cs

@@ -4,7 +4,7 @@ internal class ToolFactory
 {
     static ReaderFactory readerFactory = RhSolutionsAddIn.ServiceProvider.GetService<ReaderFactory>();
     static WriterFactory writerFactory = RhSolutionsAddIn.ServiceProvider.GetService<WriterFactory>();
-    static ISleevesCalculator sleevesCaluculator = RhSolutionsAddIn.ServiceProvider.GetService<ISleevesCalculator>();
+    static IFittingsCalculator sleevesCaluculator = RhSolutionsAddIn.ServiceProvider.GetService<IFittingsCalculator>();
 
     public Tool GetTool(string toolName)
     {

RhSolutions.Tests/CanFillSleeves.cs

@@ -6,7 +6,7 @@ namespace RhSolutions.Tests;
 public class CanFillSleeves : IDisposable
 {
     private RhSolutionsAddIn _addIn;
-    private ISleevesCalculator _calculator;
+    private IFittingsCalculator _calculator;
     private IReader _reader;
     private IWriter _writer;
     private Worksheet _worksheet;
@@ -25,7 +25,7 @@ public class CanFillSleeves : IDisposable
     public void CanCalculateSleeves()
     {
         var products = _reader.ReadProducts(new[] { _worksheet });
-        var sleeves = _calculator.CalculateSleeves(products.First().Item2);
+        var sleeves = _calculator.Calculate(products.First().Item2);
         _writer.WriteProducts(sleeves);
 
         Assert.Equal(25, _worksheet.Range["E2"].Value);