0
0

Compare commits

..

No commits in common. "b91d8fbe99ac56155e6b7547d2e4931832eeb9f4" and "931b08e00d8822e98db036c169dcbe83c2361635" have entirely different histories.

23 changed files with 317 additions and 307 deletions

View File

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

View File

@ -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);

View File

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

View File

@ -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"]}";
}
}

View File

@ -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}°";
}
}

View File

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

View File

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

View File

@ -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]}";
}
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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["отр"]}";
}
}
}

View File

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