diff --git a/Rehau.Sku.Assist.csproj b/Rehau.Sku.Assist.csproj
index 5b7438a..6667639 100644
--- a/Rehau.Sku.Assist.csproj
+++ b/Rehau.Sku.Assist.csproj
@@ -1,5 +1,7 @@
+
+
Debug
@@ -46,6 +48,9 @@
packages\ExcelDna.Registration.1.5.0\lib\net452\ExcelDna.Registration.dll
True
+
+ packages\NUnit.3.13.2\lib\net45\nunit.framework.dll
+
packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
@@ -80,12 +85,13 @@
-
-
-
-
+
+
+
+
-
+
+
@@ -100,5 +106,7 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
\ No newline at end of file
diff --git a/src/Assistant/IProduct.cs b/Source/Assistant/IProduct.cs
similarity index 100%
rename from src/Assistant/IProduct.cs
rename to Source/Assistant/IProduct.cs
diff --git a/src/Assistant/Product.cs b/Source/Assistant/Product.cs
similarity index 100%
rename from src/Assistant/Product.cs
rename to Source/Assistant/Product.cs
diff --git a/Source/Assistant/SkuAssist.cs b/Source/Assistant/SkuAssist.cs
new file mode 100644
index 0000000..152dbbb
--- /dev/null
+++ b/Source/Assistant/SkuAssist.cs
@@ -0,0 +1,80 @@
+using AngleSharp;
+using AngleSharp.Dom;
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace Rehau.Sku.Assist
+{
+ static class SkuAssist
+ {
+ private static HttpClient _httpClient;
+ private enum ResponseOrder
+ {
+ NoSettings,
+ Relevance,
+ Name,
+ Price,
+ Series
+ }
+ private static void _EnsureHttpClientRunning()
+ {
+ if (_httpClient == null)
+ _httpClient = new HttpClient();
+ }
+
+ public async static Task GetContent(string request)
+ {
+ Uri uri = _ConvertToUri(request, ResponseOrder.NoSettings);
+ _EnsureHttpClientRunning();
+ ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+
+ return await _httpClient.GetStringAsync(uri);
+ }
+
+ public async static Task GetDocument(Task source)
+ {
+ IConfiguration config = Configuration.Default;
+ IBrowsingContext context = BrowsingContext.New(config);
+
+ return await context.OpenAsync(req => req.Content(source.Result));
+ }
+
+ public static IProduct GetProductFromDocument(IDocument document)
+ {
+ return document
+ .All
+ .Where(e => e.ClassName == "product-item__desc-top")
+ .Select(e => new Product(e.Children[0].TextContent, e.Children[1].TextContent.Trim(new[] { '\n', ' ' })))
+ .FirstOrDefault();
+ }
+
+ private static Uri _ConvertToUri(this string request, ResponseOrder order)
+ {
+ string cleanedRequest = request._CleanRequest();
+ switch (order)
+ {
+ case ResponseOrder.Relevance:
+ return new Uri("https://shop-rehau.ru/catalogsearch/result/index/?dir=asc&order=relevance&q=" + cleanedRequest);
+ case ResponseOrder.Name:
+ return new Uri("https://shop-rehau.ru/catalogsearch/result/index/?dir=asc&order=name&q=" + cleanedRequest);
+ case ResponseOrder.Price:
+ return new Uri("https://shop-rehau.ru/catalogsearch/result/index/?dir=asc&order=price&q=" + cleanedRequest);
+ case ResponseOrder.Series:
+ return new Uri("https://shop-rehau.ru/catalogsearch/result/index/?dir=asc&order=sch_product_series&q=" + cleanedRequest);
+ case ResponseOrder.NoSettings:
+ return new Uri("https://shop-rehau.ru/catalogsearch/result/?q=" + cleanedRequest);
+ default:
+ throw new ArgumentException();
+ }
+ }
+ private static string _CleanRequest(this string input)
+ {
+ return input.Replace("+", " plus ");
+ }
+ }
+}
+
+
diff --git a/src/ExcelDNA/AddIn.cs b/Source/ExcelDNA/AddIn.cs
similarity index 100%
rename from src/ExcelDNA/AddIn.cs
rename to Source/ExcelDNA/AddIn.cs
diff --git a/src/ExcelDNA/Functions.cs b/Source/ExcelDNA/Functions.cs
similarity index 74%
rename from src/ExcelDNA/Functions.cs
rename to Source/ExcelDNA/Functions.cs
index ec9c607..a282e3e 100644
--- a/src/ExcelDNA/Functions.cs
+++ b/Source/ExcelDNA/Functions.cs
@@ -7,15 +7,13 @@ namespace Rehau.Sku.Assist
{
public class Functions
{
- private static HttpClient _httpClient = new HttpClient();
-
[ExcelFunction]
public static async Task RAUNAME(string request)
{
- Task contentTask = Task.Run(() => SkuAssist.GetContent(request, _httpClient));
+ Task contentTask = Task.Run(() => SkuAssist.GetContent(request));
Task documentTask = await contentTask.ContinueWith(content => SkuAssist.GetDocument(content));
IProduct product = await documentTask.ContinueWith(doc => SkuAssist.GetProductFromDocument(doc.Result));
- return product == null ? ExcelError.ExcelErrorNull.ToString() : product.ToString();
+ return product != null ? product.ToString() : "Не найдено";
}
}
}
\ No newline at end of file
diff --git a/Tests/SkuAssistTests.cs b/Tests/SkuAssistTests.cs
new file mode 100644
index 0000000..fc47c41
--- /dev/null
+++ b/Tests/SkuAssistTests.cs
@@ -0,0 +1,15 @@
+using NUnit.Framework;
+
+namespace Rehau.Sku.Assist.Tests
+{
+ [TestFixture]
+ public class SkuAssistTests
+ {
+ [Test]
+ public async void BaseTest()
+ {
+ var result = await Functions.RAUNAME("160001");
+ Assert.AreEqual("Надвижная гильза REHAU RAUTITAN РХ (11600011001)", result);
+ }
+ }
+}
diff --git a/packages.config b/packages.config
index cc383d8..96d00fe 100644
--- a/packages.config
+++ b/packages.config
@@ -4,6 +4,8 @@
+
+
diff --git a/src/Assistant/SkuAssist.cs b/src/Assistant/SkuAssist.cs
deleted file mode 100644
index dc36dc0..0000000
--- a/src/Assistant/SkuAssist.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using AngleSharp;
-using AngleSharp.Dom;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace Rehau.Sku.Assist
-{
- static class SkuAssist
- {
- public async static Task GetContent(string request, HttpClient httpClient)
- {
- string uri = "https://shop-rehau.ru/catalogsearch/result/?q=" + request._CleanRequest();
- ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
-
- return await httpClient.GetStringAsync(uri);
- }
-
- public async static Task GetDocument(Task source)
- {
- IConfiguration config = Configuration.Default;
- IBrowsingContext context = BrowsingContext.New(config);
-
- return await context.OpenAsync(req => req.Content(source.Result));
- }
-
- public static IProduct GetProductFromDocument(IDocument document)
- {
- return document
- .All
- .Where(e => e.ClassName == "product-item__desc-top")
- .Select(e => new Product(e.Children[0].TextContent, e.Children[1].TextContent.Trim(new[] { '\n', ' ' })))
- .FirstOrDefault();
- }
-
- private static string _CleanRequest(this string input)
- {
- return input.Replace("+", " plus ");
- }
- }
-}
-
-