RhSolutions.Api.Tests/ProductQueryModifierTests.cs

@@ -1,3 +1,6 @@
+using System.Web;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
 public abstract class ProductQueryModifierTests
 {
 	protected ProductQueryModifierFactory _factory;
@@ -7,10 +10,17 @@ public abstract class ProductQueryModifierTests
 	{
 		_factory = new ProductQueryModifierFactory();
 	}
-	public void Execute(string productType, string query, string expected)
+	public void Execute(string productType, string query, string modified)
 	{
+		Dictionary<string, StringValues> queryPair = new()
+		{
+			["query"] = new StringValues(query)
+		};
+		QueryCollection collection = new(queryPair);		
 		var modifier = _factory.GetModifier(productType);
-		Assert.True(modifier.TryQueryModify(query, out var actual));
+		
-		Assert.That(actual, Is.EqualTo(expected));
+		Assert.True(modifier.TryQueryModify(collection, out var actual));
+		string? result = HttpUtility.ParseQueryString(actual.ToString())["query"];
+		Assert.That(result, Is.EqualTo(modified));
 	}
 }

RhSolutions.Api/Middleware/QueryModifier.cs

@@ -1,35 +1,30 @@
-using Microsoft.AspNetCore.Http.Extensions;
+using RhSolutions.Api.Services;
-using RhSolutions.Api.Services;
 using RhSolutions.QueryModifiers;
 
 namespace RhSolutions.Api.Middleware;
 
 public class QueryModifier
 {
-	private RequestDelegate _next;
+    private RequestDelegate _next;
 
-	public QueryModifier(RequestDelegate nextDelegate)
+    public QueryModifier(RequestDelegate nextDelegate)
-	{
+    {
-		_next = nextDelegate;
+        _next = nextDelegate;
-	}
+    }
 
-	public async Task Invoke(HttpContext context, IProductTypePredicter typePredicter, ProductQueryModifierFactory productQueryModifierFactory)
+    public async Task Invoke(HttpContext context, IProductTypePredicter typePredicter, ProductQueryModifierFactory productQueryModifierFactory)
-	{
+    {
-		if (context.Request.Method == HttpMethods.Get
+        if (context.Request.Method == HttpMethods.Get
-				&& context.Request.Path == "/api/search")
+                && context.Request.Path == "/api/search")
-		{
+        {
-			string query = context.Request.Query["query"].ToString();
+            string query = context.Request.Query["query"].ToString();
-			var productType = typePredicter.GetPredictedProductType(query);
+            var productType = typePredicter.GetPredictedProductType(query);
-			var modifier = productQueryModifierFactory.GetModifier(productType!);
+            var modifier = productQueryModifierFactory.GetModifier(productType!);
-			if (modifier.TryQueryModify(query, out var modified))
+            if (modifier.TryQueryModify(context.Request.Query, out var newQuery))
-			{
+            {
-				QueryBuilder qb = new()
+                context.Request.QueryString = newQuery;
-				{
+            }
-					{"query", modified}
+        }
-				};
+        await _next(context);
-				context.Request.QueryString = qb.ToQueryString();
+    }
-			}
-		}
-		await _next(context);
-	}
 }

RhSolutions.QueryModifiers/BypassQueryModifier.cs

@@ -1,10 +1,12 @@
-namespace RhSolutions.QueryModifiers;
+using Microsoft.AspNetCore.Http;
+
+namespace RhSolutions.QueryModifiers;
 
 public sealed class BypassQueryModifier : IProductQueryModifier
 {
-	public bool TryQueryModify(string query, out string queryModified)
+    public bool TryQueryModify(IQueryCollection collection, out QueryString queryString)
-	{
+    {
-		queryModified = string.Empty;
+        queryString = QueryString.Empty;
-		return false;
+        return false;
-	}
+    }
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Adapter.cs

@@ -4,20 +4,18 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
 public abstract class Adapter : DrinkingWaterHeatingFitting
 {
-	public override bool TryQueryModify(string input, out string output)
+	protected override string? BuildRhSolutionsName(string query)
 	{
-		output = string.Empty;
+		Match diameter = _diameter.Match(query);
-		Match diameter = _diameter.Match(input);
 		if (!diameter.Success)
 		{
-			return false;
+			return null;
 		}
-		Match thread = _thread.Match(input);
+		Match thread = _thread.Match(query);
 		if (!thread.Success)
 		{
-			return false;
+			return null;
 		}
-		output = $"{_title} {diameter.Groups["Diameter"]} {thread.Groups["Thread"]}";
+		return $"{_title} {diameter.Groups["Diameter"]} {thread.Groups["Thread"]}";
-		return true;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs

@@ -2,23 +2,21 @@
 
 public class BendFormerHeating : DrinkingWaterHeatingFitting
 {
-	protected override string _title => "Фиксатор поворота";
+    protected override string _title => "Фиксатор поворота";
-	public override bool TryQueryModify(string input, out string output)
+    protected override string? BuildRhSolutionsName(string query)
-	{
+    {
-		output = string.Empty;
+        var diameterMatch = _diameter.Match(query);
-		var diameterMatch = _diameter.Match(input);
+        if (!diameterMatch.Success)
-		if (!diameterMatch.Success)
+        {
-		{
+            return null;
-			return false;
+        }
-		}
+        string diameter = diameterMatch.Groups["Diameter"].Value;
-		string diameter = diameterMatch.Groups["Diameter"].Value;
+        if (diameter == "16")
-		if (diameter == "16")
+        {
-		{
+            diameter += "/17";
-			diameter += "/17";
+        }
-		}
+        var angleMatch = _angle.Match(query);
-		var angleMatch = _angle.Match(input);
+        string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
-		string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
+        return $"{_title} {diameter}/{angle}°";
-		output = $"{_title} {diameter}/{angle}°";
+    }
-		return true;
-	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs

@@ -2,20 +2,17 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
 public class BendFormerSanitary : DrinkingWaterHeatingFitting
 {
-	protected override string _title => "Фиксатор поворота с кольцами";
+    protected override string _title => "Фиксатор поворота с кольцами";
-
+    protected override string? BuildRhSolutionsName(string query)
-	public override bool TryQueryModify(string input, out string output)
+    {
-	{
+        var diameterMatch = _diameter.Match(query);
-		output = string.Empty;
+        if (!diameterMatch.Success)
-		var diameterMatch = _diameter.Match(input);
+        {
-		if (!diameterMatch.Success)
+            return null;
-		{
+        }
-			return false;
+        string diameter = diameterMatch.Groups["Diameter"].Value;
-		}
+        var angleMatch = _angle.Match(query);
-		string diameter = diameterMatch.Groups["Diameter"].Value;
+        string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
-		var angleMatch = _angle.Match(input);
+        return $"{_title} {angle}° {diameter}";
-		string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
+    }
-		output = $"{_title} {angle}° {diameter}";
-		return true;
-	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs

@@ -9,18 +9,16 @@ public class ConnectionBend : DrinkingWaterHeatingFitting
 		new(@"([\b\D]|^)?(?<Diameter>16|20|25)(\D+|.*15.*)(?<Length>\b\d{3,4})([\b\D]|$)");
 	protected override string _title => "Трубка Г-образная";
 
-	public override bool TryQueryModify(string input, out string output)
+	protected override string? BuildRhSolutionsName(string query)
 	{
-		output = string.Empty;
+		var match = _pattern.Match(query);
-		var match = _pattern.Match(input);
 		if (!match.Success)
 		{
-			return false;
+			return null;
 		}
 		string diameter =  match.Groups["Diameter"].Value;
 		int length = int.Parse(match.Groups["Length"].Value);
 		int nearest = lengths.OrderBy(x => Math.Abs(x - length)).First();
-		output = $"{_title} {diameter}/{nearest}";
+		return $"{_title} {diameter}/{nearest}";
-		return true;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs

@@ -3,27 +3,24 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 public class Coupling : DrinkingWaterHeatingFitting
 {
 	protected override string _title => "Муфта соединительная";
-
+	protected override string? BuildRhSolutionsName(string query)
-	public override bool TryQueryModify(string input, out string output)
 	{
-		output = string.Empty;
+		var diametersMatches = _diameter.Matches(query);			
-		var diametersMatches = _diameter.Matches(input);			
 		if (diametersMatches.Count == 0)		
 		{
-			return false;
+			return null;
 		}
 		var diameters = diametersMatches.Select(x => x.Groups["Diameter"].Value)
 			.Take(2)
 			.OrderByDescending(x => int.Parse(x))
 			.ToArray();			
 		if (diameters.Length == 1 || diameters[0] == diameters[1])
-		{
+			{
-			output = $"{_title} равнопроходная {diameters[0]}";
+				return $"{_title} равнопроходная {diameters[0]}";
-		}
+			}
-		else
+			else
-		{
+			{
-			output = $"{_title} переходная {diameters[0]}-{diameters[1]}";
+				return $"{_title} переходная {diameters[0]}-{diameters[1]}";
-		}
+			}
-		return true;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs

@@ -1,4 +1,6 @@
 using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 
 namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
@@ -13,18 +15,34 @@ public abstract class DrinkingWaterHeatingFitting : IProductQueryModifier
 
 	protected virtual string _title { get; } = string.Empty;
 
-	public virtual bool TryQueryModify(string input, out string output)
+	public bool TryQueryModify(IQueryCollection collection, out QueryString queryString)
 	{
-		var match = _diameter.Match(input);
+		queryString = QueryString.Empty;
-		if (match.Success)
+		string query = collection["query"].ToString();
+		if (string.IsNullOrEmpty(query))
 		{
-			output = $"{_title} {match.Groups["Diameter"]}";
-			return true;
-		}
-		else
-		{
-			output = string.Empty;
 			return false;
 		}
+		string? result = BuildRhSolutionsName(query);
+		if (result != null)
+		{
+			QueryBuilder qb = new()
+			{
+				{ "query", result }
+			};
+			queryString = qb.ToQueryString();
+			return true;
+		}
+		return false;
+	}
+
+	protected virtual string? BuildRhSolutionsName(string query)
+	{
+		var match = _diameter.Match(query);
+		if (match.Success)
+		{
+			return $"{_title} {match.Groups["Diameter"]}";
+		}
+		return null;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ElbowModifier.cs

@@ -2,20 +2,17 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
 public class ElbowModifier : DrinkingWaterHeatingFitting
 {
-	protected override string _title { get; } = "Угольник RAUTITAN -PLATINUM";
+    protected override string _title { get; } = "Угольник RAUTITAN -PLATINUM";
-	
+    protected override string? BuildRhSolutionsName(string query)
-	public override bool TryQueryModify(string input, out string output)
+    {
-	{
+        var diameterMatch = _diameter.Match(query);
-		output = string.Empty;
+        if (!diameterMatch.Success)
-		var diameterMatch = _diameter.Match(input);
+        {
-		if (!diameterMatch.Success)
+            return null;
-		{
+        }
-			return false;
+        string diameter = diameterMatch.Groups["Diameter"].Value;
-		}
+        var angleMatch = _angle.Match(query);
-		string diameter = diameterMatch.Groups["Diameter"].Value;
+        string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
-		var angleMatch = _angle.Match(input);
+        return $"{_title} {angle} {diameter}";
-		string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
+    }
-		output = $"{_title} {angle} {diameter}";
-		return true;
-	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Eurocone.cs

@@ -4,19 +4,18 @@ public abstract class Eurocone : DrinkingWaterHeatingFitting
 {
 	protected virtual Dictionary<string, string> _titles { get; } = new();
 
-	public override bool TryQueryModify(string input, out string output)
+	protected override string? BuildRhSolutionsName(string query)
 	{
-		output = string.Empty;
+		var diameterMatch = _diameter.Match(query);
-		var diameterMatch = _diameter.Match(input);
 		if (diameterMatch.Success)
 		{
 			string diameter = diameterMatch.Groups["Diameter"].Value;
 			if (_titles.TryGetValue(diameter, out string? title))
 			{
-				output = title;
+				return title;
-				return true;
 			}
+			else return null;
 		}
-		return false;
+		return null;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs

@@ -3,17 +3,14 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 public class EuroconeAdapter : DrinkingWaterHeatingFitting
 {
 	protected override string _title => "Переходник на евроконус";
-
+	protected override string? BuildRhSolutionsName(string query)
-	public override bool TryQueryModify(string input, out string output)
 	{
-		output = string.Empty;
+		var diameterMatch = _diameter.Match(query);
-		var diameterMatch = _diameter.Match(input);
 		if (diameterMatch.Success)
 		{
 			string diameter = diameterMatch.Groups["Diameter"].Value;
-			output = $"{_title} {diameter}-G 3/4";
+			return $"{_title} {diameter}-G 3/4";
-			return true;
 		}
-		return false;
+		return null;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeConnectionBend.cs

@@ -2,9 +2,8 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
 public class EuroconeConnectionBend : DrinkingWaterHeatingFitting
 {
-	public override bool TryQueryModify(string input, out string output)
+    protected override string? BuildRhSolutionsName(string query)
-	{
+    {
-		output = "Резьбозажимное соединение для металлической трубки G 3/4 -15";
+        return "Резьбозажимное соединение для металлической трубки G 3/4 -15";
-		return true;
+    }
-	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Nippel.cs

@@ -2,9 +2,8 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
 public class Nippel : DrinkingWaterHeatingFitting
 {
-	public override bool TryQueryModify(string input, out string output)
+    protected override string? BuildRhSolutionsName(string query)
-	{
+    {
-		output = "К-т двух резьбозажим. нипелей с нар.резьбой 1/2х3/4";
+        return "К-т двух резьбозажим. нипелей с нар.резьбой 1/2х3/4";
-		return true;
+    }
-	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/SupportingClip.cs

@@ -4,10 +4,9 @@ public class SupportingClip : DrinkingWaterHeatingFitting
 {
 	protected override string _title => "Фиксирующий желоб для ПЭ-трубы";
 
-	public override bool TryQueryModify(string input, out string output)
+	protected override string? BuildRhSolutionsName(string query)
 	{
-		output = string.Empty;		
+		var diameterMatch = _diameter.Match(query);
-		var diameterMatch = _diameter.Match(input);
 		if (diameterMatch.Success)
 		{
 			string diameter = diameterMatch.Groups["Diameter"].Value;
@@ -15,9 +14,8 @@ public class SupportingClip : DrinkingWaterHeatingFitting
 			{
 				diameter += "/17";
 			}
-			output = $"{_title} {diameter}";
+			return $"{_title} {diameter}";
-			return true;
 		}
-		return false;
+		return null;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs

@@ -2,26 +2,24 @@
 
 public class TPiece : DrinkingWaterHeatingFitting
 {
-	protected override string _title => "Тройник RAUTITAN -PLATINUM";
+    protected override string _title => "Тройник RAUTITAN -PLATINUM";
 
-	public override bool TryQueryModify(string input, out string output)
+    protected override string? BuildRhSolutionsName(string query)
-	{
+    {
-		output = string.Empty;
+        var diameters = _diameter.Matches(query)
-		var diameters = _diameter.Matches(input)
+            .Select(match => match.Groups["Diameter"].Value)
-			.Select(match => match.Groups["Diameter"].Value)
+            .ToArray();
-			.ToArray();
+        if (diameters.Length == 1)
-		if (diameters.Length == 1)
+        {
-		{
+            return $"{_title} {diameters[0]}-{diameters[0]}-{diameters[0]}";
-			output = $"{_title} {diameters[0]}-{diameters[0]}-{diameters[0]}";
+        }
-		}
+        else if (diameters.Length >= 3)
-		else if (diameters.Length >= 3)
+        {
-		{
+            return $"{_title} {diameters[0]}-{diameters[1]}-{diameters[2]}";
-			output = $"{_title} {diameters[0]}-{diameters[1]}-{diameters[2]}";
+        }
-		}
+        else
-		else
+        {
-		{
+            return null;
-			return false;
+        }
-		}
+    }
-		return true;
-	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowDoubleWallInternal.cs

@@ -7,25 +7,23 @@ public class ThreadElbowDoubleWallInternal : DrinkingWaterHeatingFitting
 	protected override string _title => "Проточный настенный угольник";
 	private Regex _type = new(@"([\b\Wу])(?<Type>длин)([\b\w\.\s])");
 
-	public override bool TryQueryModify(string input, out string output)
+	protected override string? BuildRhSolutionsName(string query)
 	{
-		output = string.Empty;
+		var diameterMatches = _diameter.Matches(query);
-		var diameterMatches = _diameter.Matches(input);
 		if (diameterMatches.Count == 0)
 		{
-			return false;
+			return null;
 		}
-		var threadMatch = _thread.Match(input);
+		var threadMatch = _thread.Match(query);
 		if (!threadMatch.Success)
 		{
-			return false;
+			return null;
 		}
-		var typeMatch = _type.Match(input);
+		var typeMatch = _type.Match(query);
 		string[] diameters = diameterMatches.Select(x => x.Groups["Diameter"].Value).ToArray();
 		string thread = threadMatch.Groups["Thread"].Value;
 		string type = typeMatch.Success ? "длинный" : "короткий";
 		
-		output = $"{_title} {diameters[0]}/{(diameters.Length > 1 ? diameters[1] : diameters[0])}-Rp {thread} {type}";
+		return $"{_title} {diameters[0]}/{(diameters.Length > 1 ? diameters[1] : diameters[0])}-Rp {thread} {type}";
-		return true;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs

@@ -3,23 +3,20 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 public class ThreadElbowWallExternal : DrinkingWaterHeatingFitting
 {
 	protected override string _title => "Угольник настенный с наружной резьбой";
-
+	protected override string? BuildRhSolutionsName(string query)
-	public override bool TryQueryModify(string input, out string output)
 	{
-		output = string.Empty;
+		var diameterMatch = _diameter.Match(query);
-		var diameterMatch = _diameter.Match(input);
 		if (!diameterMatch.Success)
 		{
-			return false;
+			return null;
 		}
-		var threadMatch = _thread.Match(input);
+		var threadMatch = _thread.Match(query);
 		if (!threadMatch.Success)
 		{
-			return false;
+			return null;
 		}
 		string diameter = diameterMatch.Groups["Diameter"].Value;
 		string thread = threadMatch.Groups["Thread"].Value;
-		output = $"{_title} {diameter}-R {thread}";
+		return $"{_title} {diameter}-R {thread}";
-		return true;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallInternal.cs

@@ -6,24 +6,21 @@ public class ThreadElbowWallInternal : DrinkingWaterHeatingFitting
 {
 	protected override string _title => "Угольник настенный внутр. резьба";
 	private Regex _type = new(@"([\b\Wу])(?<Type>длин)([\b\w\.\s])");
-
+	protected override string? BuildRhSolutionsName(string query)
-	public override bool TryQueryModify(string input, out string output)
 	{		
-		output = string.Empty;
+		var diameterMatch = _diameter.Match(query);
-		var diameterMatch = _diameter.Match(input);
 		if (!diameterMatch.Success)
 		{
-			return false;
+			return null;
 		}
-		var threadMatch = _thread.Match(input);
+		var threadMatch = _thread.Match(query);
 		if (!threadMatch.Success)
 		{
-			return false;
+			return null;
 		}
-		var typeMatch = _type.Match(input);
+		var typeMatch = _type.Match(query);
 		string diameter = diameterMatch.Groups["Diameter"].Value;
 		string thread = threadMatch.Groups["Thread"].Value;
-		output = $"{_title} {(typeMatch.Success ? "длинный " : string.Empty)}{diameter}-Rp {thread}";
+		return $"{_title} {(typeMatch.Success ? "длинный " : string.Empty)}{diameter}-Rp {thread}";
-		return true;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs

@@ -4,26 +4,23 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
 public class ThreadTPieceExternal : DrinkingWaterHeatingFitting
 {
-	protected override string _title => "Тройник RAUTITAN с наружной резьбой";
+    protected override string _title => "Тройник RAUTITAN с наружной резьбой";
-
+    protected override string? BuildRhSolutionsName(string query)
-	public override bool TryQueryModify(string input, out string output)
+    {
-	{
+        MatchCollection diametersMatches = _diameter.Matches(query);
-		output = string.Empty;
+        if (diametersMatches.Count == 0)
-		MatchCollection diametersMatches = _diameter.Matches(input);
+        {
-		if (diametersMatches.Count == 0)
+            return null;
-		{
+        }
-			return false;
+        string thread = _thread.Match(query).Groups["Thread"].Value;
-		}
+        int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
-		string thread = _thread.Match(input).Groups["Thread"].Value;
+        if (diameters.Length == 1)
-		int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
+        {
-		if (diameters.Length == 1)
+            return $"{_title} {diameters[0]}-{diameters[0]}-R {thread}";
-		{
+        }
-			output = $"{_title} {diameters[0]}-{diameters[0]}-R {thread}";
+        else
-		}
+        {
-		else
+            return $"{_title} {diameters[0]}-{diameters[1]}-R {thread}";
-		{
+        }
-			output = $"{_title} {diameters[0]}-{diameters[1]}-R {thread}";
+    }
-		}
-		return true;
-	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs

@@ -4,38 +4,36 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
 public class ThreadTPieceInternal : DrinkingWaterHeatingFitting
 {
-	public override bool TryQueryModify(string input, out string output)
+    protected override string? BuildRhSolutionsName(string query)
-	{
+    {
-		output = string.Empty;
+        MatchCollection diametersMatches = _diameter.Matches(query);
-		MatchCollection diametersMatches = _diameter.Matches(input);
+        if (diametersMatches.Count == 0)
-		if (diametersMatches.Count == 0)
+        {
-		{
+            return null;
-			return false;
+        }
-		}
+        string thread = _thread.Match(query).Groups["Thread"].Value;
-		string thread = _thread.Match(input).Groups["Thread"].Value;
+        int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
-		int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
+        if (diameters.Length == 1)
-		if (diameters.Length == 1)
+        {
-		{
+            if (diameters[0] < 25)
-			if (diameters[0] < 25)
+            {
-			{
+                return $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[0]}";
-				output = $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[0]}";
+            }
-			}
+            else
-			else
+            {
-			{
+                return $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[0]}";
-				output = $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[0]}";
+            }
-			}
+        }
-		}
+        else
-		else
+        {
-		{
+            if (diameters[0] < 25)
-			if (diameters[0] < 25)
+            {
-			{
+                return $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[1]}";
-				output = $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[1]}";
+            }
-			}
+            else
-			else
+            {
-			{
+                return $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[1]}";
-				output = $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[1]}";
+            }
-			}
+        }
-		}
+    }
-		return true;
-	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs

@@ -1,56 +1,77 @@
 using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 
 namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingPipes;
 
 public class DrinkingWaterHeatingPipe : IProductQueryModifier
 {
-	protected static readonly Regex _diameter =
+    protected static readonly Regex _diameter =
-		new(@"([\b\D]|^)?(?<Diameter>16|20|25|32|40|50|63)([\b\D]|$)");
+        new(@"([\b\D]|^)?(?<Diameter>16|20|25|32|40|50|63)([\b\D]|$)");
-	protected static readonly Regex _type = 
+    protected static readonly Regex _type = 
-		new(@"([\b\W])(?<Type>бухт|отр|штанг)([\b\w\.\s])");
+        new(@"([\b\W])(?<Type>бухт|отр|штанг)([\b\w\.\s])");
-	protected virtual string _title { get; } = string.Empty;
+    protected virtual string _title { get; } = string.Empty;
 
-	protected virtual Dictionary<int, string> _diameterNames { get; } = new()
+    protected virtual Dictionary<int, string> _diameterNames { get; } = new()
-	{
+    {
-		[16] = "16x2,2",
+        [16] = "16x2,2",
-		[20] = "20x2,8",
+        [20] = "20x2,8",
-		[25] = "25x3,5",
+        [25] = "25x3,5",
-		[32] = "32x4,4",
+        [32] = "32x4,4",
-		[40] = "40x5,5",
+        [40] = "40x5,5",
-		[50] = "50x6,9",
+        [50] = "50x6,9",
-		[63] = "63x8,6"
+        [63] = "63x8,6"
-	};
+    };
 
-	protected virtual Dictionary<string, string> _makeUp { get; } = new()
+    protected virtual Dictionary<string, string> _makeUp { get; } = new()
-	{
+    {
-		["бухт"] = "бухта",
+        ["бухт"] = "бухта",
-		["штанг"] = "прям.отрезки",
+        ["штанг"] = "прям.отрезки",
-		["отр"] = "прям.отрезки"
+        ["отр"] = "прям.отрезки"
-	};
+    };
 
-	public bool TryQueryModify(string input, out string output)
+    public bool TryQueryModify(IQueryCollection collection, out QueryString queryString)
-	{
+    {
-		output = string.Empty;
+        queryString = QueryString.Empty;
-		var diameterMatch = _diameter.Match(input);
+        string query = collection["query"].ToString();
-		if (!diameterMatch.Success)
+        if (string.IsNullOrEmpty(query))
-		{
+        {
-			return false;
+            return false;
-		}
+        }
-		var diameter = int.Parse(diameterMatch.Groups["Diameter"].Value);
+        string? result = BuildRhSolutionsName(query);
-		var typeMatch = _type.Match(input);
+        if (result != null)
-		if (typeMatch.Success)
+        {
-		{
+            QueryBuilder qb = new()
-			var type = typeMatch.Groups["Type"].Value;
+            {
-			output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp[type]}";
+                { "query", result }
-		}
+            };
-		else if (diameter < 32)
+            queryString = qb.ToQueryString();
-		{
+            return true;
-			output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp["бухт"]}";
+        }
-		}
+        return false;
-		else
+    }
-		{
+
-			output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp["отр"]}";
+    protected virtual string? BuildRhSolutionsName(string query)
-		}
+    {
-		return true;
+        var diameterMatch = _diameter.Match(query);
-	}
+        if (!diameterMatch.Success)
+        {
+            return null;
+        }
+        var diameter = int.Parse(diameterMatch.Groups["Diameter"].Value);
+        var typeMatch = _type.Match(query);
+        if (typeMatch.Success)
+        {
+            var type = typeMatch.Groups["Type"].Value;
+            return $"Труба {_title} {_diameterNames[diameter]} {_makeUp[type]}";
+        }
+        else if (diameter < 32)
+        {
+            return $"Труба {_title} {_diameterNames[diameter]} {_makeUp["бухт"]}";
+        }
+        else
+        {
+            return $"Труба {_title} {_diameterNames[diameter]} {_makeUp["отр"]}";
+        }
+    }
 }

RhSolutions.QueryModifiers/IProductQueryModifier.cs

@@ -1,6 +1,8 @@
-namespace RhSolutions.QueryModifiers;
+using Microsoft.AspNetCore.Http;
+
+namespace RhSolutions.QueryModifiers;
 
 public interface IProductQueryModifier
 {
-    public bool TryQueryModify(string query, out string queryModified);
+    public bool TryQueryModify(IQueryCollection collection, out QueryString queryString);
 }