Dockerfile

@@ -7,8 +7,7 @@ RUN dotnet publish -c Release -o out
 
 FROM mcr.microsoft.com/dotnet/aspnet:6.0
 EXPOSE 5000
-EXPOSE 43000
 WORKDIR /app
 COPY  --from=build /app/out .
 ENV ASPNETCORE_ENVIRONMENT Production
-ENTRYPOINT [ "dotnet", "RhSolutions.Api.dll" ]
+ENTRYPOINT [ "dotnet", "RhSolutions.Api.dll", "--urls=http://0.0.0.0:5000" ]

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,5 +1,4 @@
-using Microsoft.AspNetCore.Http.Extensions;
-using RhSolutions.Api.Services;
+using RhSolutions.Api.Services;
 using RhSolutions.QueryModifiers;
 
 namespace RhSolutions.Api.Middleware;
@@ -21,13 +20,9 @@ public class QueryModifier
             string query = context.Request.Query["query"].ToString();
             var productType = typePredicter.GetPredictedProductType(query);
             var modifier = productQueryModifierFactory.GetModifier(productType!);
-			if (modifier.TryQueryModify(query, out var modified))
+            if (modifier.TryQueryModify(context.Request.Query, out var newQuery))
             {
-				QueryBuilder qb = new()
-				{
-					{"query", modified}
-				};
-				context.Request.QueryString = qb.ToQueryString();
+                context.Request.QueryString = newQuery;
             }
         }
         await _next(context);

RhSolutions.Api/Program.cs

@@ -4,7 +4,7 @@ using RhSolutions.Api.Services;
 using RhSolutions.Api.Middleware;
 using RhSolutions.QueryModifiers;
 
-var builder = WebApplication.CreateBuilder();
+var builder = WebApplication.CreateBuilder(args);
 
 string dbHost = builder.Configuration["DB_HOST"],
 	dbPort = builder.Configuration["DB_PORT"],
@@ -23,18 +23,17 @@ builder.Services.AddDbContext<RhSolutionsContext>(opts =>
 		opts.EnableSensitiveDataLogging(true);
 	}
 });
-
 builder.Services.AddScoped<IPricelistParser, ClosedXMLParser>()
 	.AddScoped<IProductTypePredicter, ProductTypePredicter>()
-	.AddSingleton<ProductQueryModifierFactory>()
-	.AddGrpc();
-
+	.AddSingleton<ProductQueryModifierFactory>();
 builder.Services.AddControllers();
 
 var app = builder.Build();
 
 app.MapControllers();
-app.MapGrpcService<SearchService>();
 app.UseMiddleware<QueryModifier>();
 
+var context = app.Services.CreateScope().ServiceProvider
+	.GetRequiredService<RhSolutionsContext>();
+	
 app.Run();

RhSolutions.Api/Properties/launchSettings.json

@@ -4,7 +4,7 @@
     "anonymousAuthentication": true,
     "launchBrowser": false,
     "iisExpress": {
-      "applicationUrl": "http://localhost:5000;http://localhost:43000",
+      "applicationUrl": "http://localhost:5000",
       "sslPort": 0
     }
   },
@@ -13,7 +13,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": false,
-      "applicationUrl": "http://localhost:5000;http://localhost:43000",
+      "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

RhSolutions.Api/Protos/product.proto

@@ -1,15 +0,0 @@
-syntax = "proto3";
-
-service ProductSearch {
-  rpc GetProduct (ProductRequest) returns (ProductReply);
-}
-
-message ProductRequest {
-  string query = 1;
-}
-
-message ProductReply {
-  string id = 1;
-  string name = 2;
-  double price = 3;
-}

RhSolutions.Api/RhSolutions.Api.csproj

@@ -9,11 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="ClosedXML" Version="0.100.0" />
-    <PackageReference Include="Grpc.AspnetCore" Version="2.58.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.59.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -34,9 +29,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Protobuf Include="Protos\product.proto" GrpcServices="Server" />
-  </ItemGroup>
-
-
 </Project>

RhSolutions.Api/Services/SearchService.cs

@@ -1,48 +0,0 @@
-using Grpc.Core;
-using RhSolutions.Models;
-using Microsoft.EntityFrameworkCore;
-using RhSolutions.QueryModifiers;
-
-namespace RhSolutions.Api.Services;
-
-public class SearchService : ProductSearch.ProductSearchBase
-{
-	private RhSolutionsContext _dbContext;
-	private IProductTypePredicter _typePredicter;
-	private ProductQueryModifierFactory _productQueryModifierFactory;
-
-	public SearchService(RhSolutionsContext dbContext, IProductTypePredicter typePredicter, ProductQueryModifierFactory productQueryModifierFactory)
-	{
-		_dbContext = dbContext;
-		_typePredicter = typePredicter;
-		_productQueryModifierFactory = productQueryModifierFactory;
-	}
-	public override async Task<ProductReply?> GetProduct(ProductRequest request, ServerCallContext context)
-	{
-		var productType = _typePredicter.GetPredictedProductType(request.Query);
-		var modifier = _productQueryModifierFactory.GetModifier(productType!);
-		string query = request.Query;
-		if (modifier.TryQueryModify(query, out var modified))
-		{
-			query = modified;
-		}
-		var product = await _dbContext.Products
-				.Where(p => EF.Functions.ToTsVector(
-					"russian", string.Join(' ', new[] { p.Name, string.Join(' ', p.ProductLines) }))
-					.Matches(EF.Functions.WebSearchToTsQuery("russian", query)))
-				.OrderByDescending(p => p.IsOnWarehouse)
-				.FirstOrDefaultAsync();
-
-		if (product != null)
-		{
-			return new ProductReply()
-			{
-				Id = product.Id,
-				Name = product.Name,
-				Price = (double)product.Price
-			};
-		}
-		return null;
-	}
-}
-

RhSolutions.Api/appsettings.json

@@ -6,17 +6,5 @@
       "Microsoft.EntityFrameworkCore": "Information"
     }
   },
-  "AllowedHosts": "*",
-  "Kestrel": {
-    "Endpoints": {
-      "Http": {
-        "Url": "http://0.0.0.0:5000",
-        "Protocols": "Http1AndHttp2"
-      },
-      "gRPC": {
-        "Url": "http://0.0.0.0:43000",
-        "Protocols": "Http2"
-      }
-    }
-  }
+     "AllowedHosts": "*"
   }

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;
     }
 }

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(input);
+		Match diameter = _diameter.Match(query);
 		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 true;
+		return $"{_title} {diameter.Groups["Diameter"]} {thread.Groups["Thread"]}";
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs

@@ -3,22 +3,20 @@
 public class BendFormerHeating : 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(input);
+        var diameterMatch = _diameter.Match(query);
         if (!diameterMatch.Success)
         {
-			return false;
+            return null;
         }
         string diameter = diameterMatch.Groups["Diameter"].Value;
         if (diameter == "16")
         {
             diameter += "/17";
         }
-		var angleMatch = _angle.Match(input);
+        var angleMatch = _angle.Match(query);
         string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
-		output = $"{_title} {diameter}/{angle}°";
-		return true;
+        return $"{_title} {diameter}/{angle}°";
     }
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs

@@ -3,19 +3,16 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 public class BendFormerSanitary : 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(input);
+        var diameterMatch = _diameter.Match(query);
         if (!diameterMatch.Success)
         {
-			return false;
+            return null;
         }
         string diameter = diameterMatch.Groups["Diameter"].Value;
-		var angleMatch = _angle.Match(input);
+        var angleMatch = _angle.Match(query);
         string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
-		output = $"{_title} {angle}° {diameter}";
-		return true;
+        return $"{_title} {angle}° {diameter}";
     }
 }

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(input);
+		var match = _pattern.Match(query);
 		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 true;
+		return $"{_title} {diameter}/{nearest}";
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs

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

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);
-		if (match.Success)
+		queryString = QueryString.Empty;
+		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

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

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(input);
+		var diameterMatch = _diameter.Match(query);
 		if (diameterMatch.Success)
 		{
 			string diameter = diameterMatch.Groups["Diameter"].Value;
 			if (_titles.TryGetValue(diameter, out string? title))
 			{
-				output = title;
-				return true;
-			}
-		}
-		return false;
+				return title;
+			}
+			else return null;
+		}
+		return null;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs

@@ -3,17 +3,14 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 public class EuroconeAdapter : 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(input);
+		var diameterMatch = _diameter.Match(query);
 		if (diameterMatch.Success)
 		{
 			string diameter = diameterMatch.Groups["Diameter"].Value;
-			output = $"{_title} {diameter}-G 3/4";
-			return true;
+			return $"{_title} {diameter}-G 3/4";
 		}
-		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 true;
+        return "Резьбозажимное соединение для металлической трубки G 3/4 -15";
     }
 }

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 true;
+        return "К-т двух резьбозажим. нипелей с нар.резьбой 1/2х3/4";
     }
 }

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(input);
+		var diameterMatch = _diameter.Match(query);
 		if (diameterMatch.Success)
 		{
 			string diameter = diameterMatch.Groups["Diameter"].Value;
@@ -15,9 +14,8 @@ public class SupportingClip : DrinkingWaterHeatingFitting
 			{
 				diameter += "/17";
 			}
-			output = $"{_title} {diameter}";
-			return true;
+			return $"{_title} {diameter}";
 		}
-		return false;
+		return null;
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs

@@ -4,24 +4,22 @@ public class TPiece : DrinkingWaterHeatingFitting
 {
     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(input)
+        var diameters = _diameter.Matches(query)
             .Select(match => match.Groups["Diameter"].Value)
             .ToArray();
         if (diameters.Length == 1)
         {
-			output = $"{_title} {diameters[0]}-{diameters[0]}-{diameters[0]}";
+            return $"{_title} {diameters[0]}-{diameters[0]}-{diameters[0]}";
         }
         else if (diameters.Length >= 3)
         {
-			output = $"{_title} {diameters[0]}-{diameters[1]}-{diameters[2]}";
+            return $"{_title} {diameters[0]}-{diameters[1]}-{diameters[2]}";
         }
         else
         {
-			return false;
-		}
-		return true;
+            return null;
+        }
     }
 }

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(input);
+		var diameterMatches = _diameter.Matches(query);
 		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 true;
+		return $"{_title} {diameters[0]}/{(diameters.Length > 1 ? diameters[1] : diameters[0])}-Rp {thread} {type}";
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs

@@ -3,23 +3,20 @@ namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 public class ThreadElbowWallExternal : 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(input);
+		var diameterMatch = _diameter.Match(query);
 		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 true;
+		return $"{_title} {diameter}-R {thread}";
 	}
 }

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])");
-
-	public override bool TryQueryModify(string input, out string output)
+	protected override string? BuildRhSolutionsName(string query)
 	{		
-		output = string.Empty;
-		var diameterMatch = _diameter.Match(input);
+		var diameterMatch = _diameter.Match(query);
 		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 true;
+		return $"{_title} {(typeMatch.Success ? "длинный " : string.Empty)}{diameter}-Rp {thread}";
 	}
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs

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

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(input);
+        MatchCollection diametersMatches = _diameter.Matches(query);
         if (diametersMatches.Count == 0)
         {
-			return false;
+            return null;
         }
-		string thread = _thread.Match(input).Groups["Thread"].Value;
+        string thread = _thread.Match(query).Groups["Thread"].Value;
         int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
         if (diameters.Length == 1)
         {
             if (diameters[0] < 25)
             {
-				output = $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[0]}";
+                return $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[0]}";
             }
             else
             {
-				output = $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[0]}";
+                return $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[0]}";
             }
         }
         else
         {
             if (diameters[0] < 25)
             {
-				output = $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[1]}";
+                return $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[1]}";
             }
             else
             {
-				output = $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[1]}";
+                return $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[1]}";
             }
         }
-		return true;
     }
 }

RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs

@@ -1,4 +1,6 @@
 using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 
 namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingPipes;
 
@@ -28,29 +30,48 @@ public class DrinkingWaterHeatingPipe : IProductQueryModifier
         ["отр"] = "прям.отрезки"
     };
 
-	public bool TryQueryModify(string input, out string output)
+    public bool TryQueryModify(IQueryCollection collection, out QueryString queryString)
     {
-		output = string.Empty;
-		var diameterMatch = _diameter.Match(input);
-		if (!diameterMatch.Success)
+        queryString = QueryString.Empty;
+        string query = collection["query"].ToString();
+        if (string.IsNullOrEmpty(query))
         {
             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 diameterMatch = _diameter.Match(query);
+        if (!diameterMatch.Success)
+        {
+            return null;
+        }
         var diameter = int.Parse(diameterMatch.Groups["Diameter"].Value);
-		var typeMatch = _type.Match(input);
+        var typeMatch = _type.Match(query);
         if (typeMatch.Success)
         {
             var type = typeMatch.Groups["Type"].Value;
-			output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp[type]}";
+            return $"Труба {_title} {_diameterNames[diameter]} {_makeUp[type]}";
         }
         else if (diameter < 32)
         {
-			output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp["бухт"]}";
+            return $"Труба {_title} {_diameterNames[diameter]} {_makeUp["бухт"]}";
         }
         else
         {
-			output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp["отр"]}";
-		}
-		return true;
+            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);
 }