From 020922d749ab0f53fc178700e2181487be9a05ee Mon Sep 17 00:00:00 2001
From: Serghei Cebotari <serghei@cebotari.ru>
Date: Fri, 20 Oct 2023 22:35:44 +0300
Subject: Edit TryQueryNodify types

---
 RhSolutions.QueryModifiers/BypassQueryModifier.cs  | 14 ++++++------
 .../DrinkingWaterHeatingFitting.cs                 | 23 +++-----------------
 .../DrinkingWaterHeatingPipe.cs                    | 25 +++++-----------------
 .../IProductQueryModifier.cs                       |  2 +-
 4 files changed, 15 insertions(+), 49 deletions(-)

(limited to 'RhSolutions.QueryModifiers')

diff --git a/RhSolutions.QueryModifiers/BypassQueryModifier.cs b/RhSolutions.QueryModifiers/BypassQueryModifier.cs
index 2c38b27..a8bba7e 100644
--- a/RhSolutions.QueryModifiers/BypassQueryModifier.cs
+++ b/RhSolutions.QueryModifiers/BypassQueryModifier.cs
@@ -1,12 +1,10 @@
-using Microsoft.AspNetCore.Http;
-
-namespace RhSolutions.QueryModifiers;
+namespace RhSolutions.QueryModifiers;
 
 public sealed class BypassQueryModifier : IProductQueryModifier
 {
-    public bool TryQueryModify(IQueryCollection collection, out QueryString queryString)
-    {
-        queryString = QueryString.Empty;
-        return false;
-    }
+	public bool TryQueryModify(string query, out string queryModified)
+	{
+		queryModified = string.Empty;
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
index 4ea9574..afd03de 100644
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
+++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
@@ -1,6 +1,4 @@
 using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
 
 namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
 
@@ -15,25 +13,10 @@ public abstract class DrinkingWaterHeatingFitting : IProductQueryModifier
 
 	protected virtual string _title { get; } = string.Empty;
 
-	public bool TryQueryModify(IQueryCollection collection, out QueryString queryString)
+	public bool TryQueryModify(string input, out string output)
 	{
-		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;
+		output = BuildRhSolutionsName(input) ?? string.Empty;
+		return !string.IsNullOrEmpty(output);
 	}
 
 	protected virtual string? BuildRhSolutionsName(string query)
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs
index d5981f0..5c1bfd9 100644
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs
+++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs
@@ -30,26 +30,11 @@ public class DrinkingWaterHeatingPipe : IProductQueryModifier
         ["отр"] = "прям.отрезки"
     };
 
-    public bool TryQueryModify(IQueryCollection collection, out QueryString queryString)
-    {
-        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;
-    }
+	public bool TryQueryModify(string input, out string output)
+	{
+		output = BuildRhSolutionsName(input) ?? string.Empty;
+		return !string.IsNullOrEmpty(output);
+	}
 
     protected virtual string? BuildRhSolutionsName(string query)
     {
diff --git a/RhSolutions.QueryModifiers/IProductQueryModifier.cs b/RhSolutions.QueryModifiers/IProductQueryModifier.cs
index 508aba5..c1a7b1d 100644
--- a/RhSolutions.QueryModifiers/IProductQueryModifier.cs
+++ b/RhSolutions.QueryModifiers/IProductQueryModifier.cs
@@ -4,5 +4,5 @@ namespace RhSolutions.QueryModifiers;
 
 public interface IProductQueryModifier
 {
-    public bool TryQueryModify(IQueryCollection collection, out QueryString queryString);
+    public bool TryQueryModify(string query, out string queryModified);
 }
-- 
cgit v1.2.3