2 files changed, 46 insertions, 16 deletions

diff --git a/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs b/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs
index aadc2c5..d795ef2 100644
--- a/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs
+++ b/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs
@@ -8,21 +8,9 @@ public static class RhSolutionsFunctions
 		RhSolutionsAddIn.ServiceProvider.GetRequiredService<ICurrencyClient>();
 
 	[ExcelFunction(Name = "РЕХАУ")]
-	public static object ProductSearch(object[,] values)
+	public static object ProductSearch(object[,] values, string searchKey)
 	{
-		List<string> strings = new();
-		int rows = values.GetLength(0);
-		int columns = values.GetLength(1);
-		for (int row = 0; row < rows; row++) 
-		{
-			for (int column = 0; column < columns; column++) 
-			{
-				object value = values[row, column];
-				strings.Add(value.ToString());
-			} 
-		}
-		
-		string query = string.Join(" ", strings.ToArray());
+		string query = MergeCellsValues(values);
 		var functionName = nameof(ProductSearch);
 		var parameters = new object[] { query };
 		if (ExcelAsyncUtil.RunTask(functionName, parameters, async () =>
@@ -38,8 +26,24 @@ public static class RhSolutionsFunctions
 		}
 		else
 		{
-			var product = products.First();
-			return $"{product.Id} {product.Name}";
+			Product product = null;
+			if (string.IsNullOrEmpty(searchKey))
+			{
+				Product mxProduct = products.FilterByName(new[] { "MX", "LX" }).FirstOrDefault();
+				if (mxProduct != null)
+				{
+					product = mxProduct;
+				}
+				else
+				{
+					product = products.FirstOrDefault();
+				}
+			}
+			else
+			{
+				product = products.FilterByName(new[] { searchKey }).FirstOrDefault();
+			}
+			return product != null ? $"{product.Id} {product.Name}" : ExcelError.ExcelErrorNA;
 		}
 	}
 
@@ -153,4 +157,21 @@ public static class RhSolutionsFunctions
 			return Math.Round(requestResult, 2);
 		}
 	}
+
+	private static string MergeCellsValues(object[,] values)
+	{
+		List<string> strings = new();
+		int rows = values.GetLength(0);
+		int columns = values.GetLength(1);
+		for (int row = 0; row < rows; row++)
+		{
+			for (int column = 0; column < columns; column++)
+			{
+				object value = values[row, column];
+				strings.Add(value.ToString());
+			}
+		}
+
+		return string.Join(" ", strings.ToArray());
+	}
 }
\ No newline at end of file
diff --git a/RhSolutions.ProductSku/ProductExtensions.cs b/RhSolutions.ProductSku/ProductExtensions.cs
new file mode 100644
index 0000000..3976581
--- /dev/null
+++ b/RhSolutions.ProductSku/ProductExtensions.cs
@@ -0,0 +1,9 @@
+namespace RhSolutions.Models;
+
+public static class ProductExtensions
+{
+	public static IEnumerable<Product> FilterByName(this IEnumerable<Product> products, string[] searchKeys)
+	{
+		return products.Where(p => searchKeys.Any(k => p.Name.Contains(k)));
+	}
+}
\ No newline at end of file