diff options
41 files changed, 379 insertions, 435 deletions
diff --git a/RhSolutions.Api.Tests/RautitanFittingsTests.cs b/RhSolutions.Api.Tests/RautitanFittingsTests.cs index aac29b8..6209d95 100644 --- a/RhSolutions.Api.Tests/RautitanFittingsTests.cs +++ b/RhSolutions.Api.Tests/RautitanFittingsTests.cs @@ -1,4 +1,5 @@ namespace RhSolutions.Api.Tests; + public class RautitanFittingsTests : ProductQueryModifierTests { [TestCase("Гильза 16", "Монтажная гильза 16")] @@ -39,8 +40,8 @@ public class RautitanFittingsTests : ProductQueryModifierTests public void ScrewcapElbowTest(string query, string modified) => Execute(productType: "Угольник с накидной гайкой", query, modified); - [TestCase("Тройник с внутр. резьбой на боков. проходе 25-Rp 1/2-25 RX+", "Тройник с внутр. резьбой на боков. проходе 25-Rp 1/2-25")] - [TestCase("Тройник настенный с внутренней резьбой 16-Rp1/2-16 RX+", "Тройник настенный с внутренней резьбой 16-Rp1/2-16")] + [TestCase("Тройник с внутр. резьбой на боков. проходе 25-Rp 1/2-25 RX+", "Тройник RAUTITAN с внутр. резьбой на боков. проходе 25-Rp 1/2-25")] + [TestCase("Тройник настенный с внутренней резьбой 16-Rp1/2-16 RX+", "Тройник RAUTITAN настенный с внутренней резьбой 16-Rp1/2-16")] public void ThreadTPieceInternalTest(string query, string modified) => Execute(productType: "Тройник RAUTITAN резьбовой внутренний", query, modified); diff --git a/RhSolutions.QueryModifiers/AdapterExternalModifier.cs b/RhSolutions.QueryModifiers/AdapterExternalModifier.cs deleted file mode 100644 index 1e7bc5d..0000000 --- a/RhSolutions.QueryModifiers/AdapterExternalModifier.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace RhSolutions.QueryModifiers -{ - public class AdapterExternalModifier : AdapterModifier - { - protected override string name => "Переходник с наружной резьбой"; - } -} diff --git a/RhSolutions.QueryModifiers/AdapterInternalModifier.cs b/RhSolutions.QueryModifiers/AdapterInternalModifier.cs deleted file mode 100644 index 7761dd1..0000000 --- a/RhSolutions.QueryModifiers/AdapterInternalModifier.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace RhSolutions.QueryModifiers -{ - public class AdapterInternalModifier : AdapterModifier - { - protected override string name => "Переходник с внутренней резьбой -угольник-переходник"; - } -} diff --git a/RhSolutions.QueryModifiers/AdapterModifier.cs b/RhSolutions.QueryModifiers/AdapterModifier.cs deleted file mode 100644 index 0ebe40d..0000000 --- a/RhSolutions.QueryModifiers/AdapterModifier.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Extensions; - -namespace RhSolutions.QueryModifiers -{ - public abstract class AdapterModifier : IProductQueryModifier - { - protected string pattern { get; } = - @"(?<Diameter>\b16|20|25|32|40|50|63\b)\D+(?<Thread>\b1\s+1/4|1\s+1/2|1/2|3/4|2|1\b)"; - protected virtual string name { get; } = string.Empty; - public bool TryQueryModify(IQueryCollection collection, out QueryString queryString) - { - queryString = QueryString.Empty; - var query = collection["query"].ToString(); - if (string.IsNullOrEmpty(query)) - { - return false; - } - var matches = Regex.Matches(query, pattern); - if (matches.Count == 0) - { - return false; - } - else - { - var match = matches.First(); - var diameter = match.Groups["Diameter"].Captures.First(); - var thread = match.Groups["Thread"].Captures.First(); - QueryBuilder qb = new() - { - {"query", $"{name} {diameter} {thread}"} - }; - queryString = qb.ToQueryString(); - return true; - } - } - } -} diff --git a/RhSolutions.QueryModifiers/AdapterScrewcapModifier.cs b/RhSolutions.QueryModifiers/AdapterScrewcapModifier.cs deleted file mode 100644 index 9841891..0000000 --- a/RhSolutions.QueryModifiers/AdapterScrewcapModifier.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace RhSolutions.QueryModifiers -{ - public class AdapterScrewcapModifier : AdapterModifier - { - protected override string name => "Переходник с накидной гайкой"; - } -} diff --git a/RhSolutions.QueryModifiers/BlackPipeQueryModifier.cs b/RhSolutions.QueryModifiers/BlackPipeQueryModifier.cs deleted file mode 100644 index d59db67..0000000 --- a/RhSolutions.QueryModifiers/BlackPipeQueryModifier.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace RhSolutions.QueryModifiers; - -public class BlackPipeQueryModifier : PipeQueryModifier -{ - protected override string diameterPattern => @"([\b\D]|^)(?<Diameter>16|20|25)([\b\D]|$)"; - protected override string pipeName => "Black"; - protected override Dictionary<string, string> diameterNames => new() - { - ["16"] = "16х2,2", - ["20"] = "20х2,8", - ["25"] = "25х3,5" - }; -} diff --git a/RhSolutions.QueryModifiers/BypassQueryModifier.cs b/RhSolutions.QueryModifiers/BypassQueryModifier.cs index 68d3cb2..2c38b27 100644 --- a/RhSolutions.QueryModifiers/BypassQueryModifier.cs +++ b/RhSolutions.QueryModifiers/BypassQueryModifier.cs @@ -2,11 +2,11 @@ namespace RhSolutions.QueryModifiers; -public class BypassQueryModifier : IProductQueryModifier +public sealed class BypassQueryModifier : IProductQueryModifier { public bool TryQueryModify(IQueryCollection collection, out QueryString queryString) { queryString = QueryString.Empty; return false; } -} +}
\ No newline at end of file diff --git a/RhSolutions.QueryModifiers/CouplingModifier.cs b/RhSolutions.QueryModifiers/CouplingModifier.cs deleted file mode 100644 index e8a1739..0000000 --- a/RhSolutions.QueryModifiers/CouplingModifier.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Extensions; - -namespace RhSolutions.QueryModifiers; - -public class CouplingModifier : IProductQueryModifier -{ - private string pattern { get; } = @"([\b\D]|^)?(?<Diameter>16|20|25|32|40|50|63)([\b\D]|$)?"; - public bool TryQueryModify(IQueryCollection collection, out QueryString queryString) - { - queryString = QueryString.Empty; - var query = collection["query"].ToString(); - if (string.IsNullOrEmpty(query)) - { - return false; - } - var matches = Regex.Matches(query, pattern); - if (matches.Count < 1) - { - return false; - } - else - { - QueryBuilder qb = new(); - if (matches.Count < 2 || matches.Count > 1 && matches[0].Groups["Diameter"].Value == matches[1].Groups["Diameter"].Value) - { - qb.Add("query", $"Муфта соединительная равнопроходная {matches[0].Groups["Diameter"].Value}"); - } - else - { - qb.Add("query", $"Муфта соединительная переходная {matches[0].Groups["Diameter"].Value}-{matches[1].Groups["Diameter"].Value}"); - } - queryString = qb.ToQueryString(); - return true; - } - } -} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Adapter.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Adapter.cs new file mode 100644 index 0000000..4074e97 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Adapter.cs @@ -0,0 +1,21 @@ +using System.Text.RegularExpressions; + +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public abstract class Adapter : DrinkingWaterHeatingFitting +{ + protected override string? BuildRhSolutionsName(string query) + { + Match diameter = _diameter.Match(query); + if (!diameter.Success) + { + return null; + } + Match thread = _thread.Match(query); + if (!thread.Success) + { + return null; + } + return $"{_title} {diameter.Groups["Diameter"]} {thread.Groups["Thread"]}"; + } +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs new file mode 100644 index 0000000..8356c59 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class AdapterExternal : Adapter +{ + protected override string _title => "Переходник с наружной резьбой"; +}
\ No newline at end of file diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterInternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterInternal.cs new file mode 100644 index 0000000..56e36f1 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterInternal.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class AdapterInternal : Adapter +{ + protected override string _title => "Переходник с внутренней резьбой -угольник-переходник"; +}
\ No newline at end of file diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterScrewcap.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterScrewcap.cs new file mode 100644 index 0000000..43fa639 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterScrewcap.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class AdapterScrewcap : Adapter +{ + protected override string _title => "Переходник с накидной гайкой"; +}
\ No newline at end of file diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs new file mode 100644 index 0000000..9d17519 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs @@ -0,0 +1,22 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class BendFormerHeating : DrinkingWaterHeatingFitting +{ + protected override string _title => "Фиксатор поворота без колец"; + protected override string? BuildRhSolutionsName(string query) + { + var diameterMatch = _diameter.Match(query); + if (!diameterMatch.Success) + { + return null; + } + string diameter = diameterMatch.Groups["Diameter"].Value; + if (diameter == "16") + { + diameter += "/17"; + } + var angleMatch = _angle.Match(query); + string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90"; + return $"{_title} {diameter}/{angle}°"; + } +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs new file mode 100644 index 0000000..4605308 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs @@ -0,0 +1,23 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class Coupling : DrinkingWaterHeatingFitting +{ + protected override string _title => "Муфта соединительная"; + protected override string? BuildRhSolutionsName(string query) + { + var diameters = _diameter.Matches(query); + if (diameters.Count == 0) + { + return null; + } + if (diameters.Count < 2 || + diameters.Count > 1 && diameters[0].Groups["Diameter"].Value == diameters[1].Groups["Diameter"].Value) + { + return $"{_title} равнопроходная {diameters[0].Groups["Diameter"]}"; + } + else + { + return $"{_title} переходная {diameters[0].Groups["Diameter"]}-{diameters[1].Groups["Diameter"]}"; + } + } +} diff --git a/RhSolutions.QueryModifiers/Heating/HeatingFittingBase.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs index 672bd6b..0adfac6 100644 --- a/RhSolutions.QueryModifiers/Heating/HeatingFittingBase.cs +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs @@ -2,16 +2,16 @@ using System.Text.RegularExpressions; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; -namespace RhSolutions.QueryModifiers.Heating; +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; -public abstract class HeatingFittingBase : IProductQueryModifier +public abstract class DrinkingWaterHeatingFitting : IProductQueryModifier { 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 _angle = - new(@"([\b\D]|^)(?<Angle>45|90)([\b\D]|$)"); + new(@"([\b\D])(?<Angle>45|90)([\b\D]|$)"); protected static readonly Regex _thread = - new(@"(\D|^)(?<Thread>1\s+1/4|1\s+1/2|1/2|3/4|2|1)(\D|$)"); + new(@"([\b\D])(?<Thread>1\s+1/4|1\s+1/2|1/2|3/4|2|1)([\b\D]|$)"); protected virtual string _title { get; } = string.Empty; diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ElbowModifier.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ElbowModifier.cs new file mode 100644 index 0000000..cccf77b --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ElbowModifier.cs @@ -0,0 +1,18 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class ElbowModifier : DrinkingWaterHeatingFitting +{ + protected override string _title { get; } = "Угольник RAUTITAN -PLATINUM"; + protected override string? BuildRhSolutionsName(string query) + { + var diameterMatch = _diameter.Match(query); + if (!diameterMatch.Success) + { + return null; + } + string diameter = diameterMatch.Groups["Diameter"].Value; + var angleMatch = _angle.Match(query); + string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90"; + return $"{_title} {angle} {diameter}"; + } +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs new file mode 100644 index 0000000..97e2fb7 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class ScrewcapElbow : Adapter +{ + protected override string _title => "Угольник-переходник с накидной гайкой"; +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Sleeve.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Sleeve.cs new file mode 100644 index 0000000..c546236 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Sleeve.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class Sleeve : DrinkingWaterHeatingFitting +{ + protected override string _title => "Монтажная гильза"; +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs new file mode 100644 index 0000000..292da22 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs @@ -0,0 +1,25 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class TPiece : DrinkingWaterHeatingFitting +{ + protected override string _title => "Тройник RAUTITAN -PLATINUM"; + + protected override string? BuildRhSolutionsName(string query) + { + var diameters = _diameter.Matches(query) + .Select(match => match.Groups["Diameter"].Value) + .ToArray(); + if (diameters.Length == 1) + { + return $"{_title} {diameters[0]}-{diameters[0]}-{diameters[0]}"; + } + else if (diameters.Length >= 3) + { + return $"{_title} {diameters[0]}-{diameters[1]}-{diameters[2]}"; + } + else + { + return null; + } + } +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs new file mode 100644 index 0000000..010fcc2 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class ThreadElbowExternal : Adapter +{ + protected override string _title => "Угольник-переходник с наружной резьбой"; +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowInternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowInternal.cs new file mode 100644 index 0000000..187f66d --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowInternal.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class ThreadElbowInternal : Adapter +{ + protected override string _title => "Угольник-переходник с внутренней резьбой"; +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs new file mode 100644 index 0000000..af5df72 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs @@ -0,0 +1,26 @@ +using System.Text.RegularExpressions; + +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class ThreadTPieceExternal : DrinkingWaterHeatingFitting +{ + protected override string _title => "Тройник RAUTITAN с наружной резьбой"; + protected override string? BuildRhSolutionsName(string query) + { + MatchCollection diametersMatches = _diameter.Matches(query); + if (diametersMatches.Count == 0) + { + return null; + } + string thread = _thread.Match(query).Groups["Thread"].Value; + int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray(); + if (diameters.Length == 1) + { + return $"{_title} {diameters[0]}-{diameters[0]}-R {thread}"; + } + else + { + return $"{_title} {diameters[0]}-{diameters[1]}-R {thread}"; + } + } +}
\ No newline at end of file diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs new file mode 100644 index 0000000..08afe62 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs @@ -0,0 +1,39 @@ +using System.Text.RegularExpressions; + +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class ThreadTPieceInternal : DrinkingWaterHeatingFitting +{ + protected override string? BuildRhSolutionsName(string query) + { + MatchCollection diametersMatches = _diameter.Matches(query); + if (diametersMatches.Count == 0) + { + return null; + } + 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) + { + return $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[0]}"; + } + else + { + return $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[0]}"; + } + } + else + { + if (diameters[0] < 25) + { + return $"Тройник RAUTITAN настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[1]}"; + } + else + { + return $"Тройник RAUTITAN с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[1]}"; + } + } + } +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/BlackPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/BlackPipe.cs new file mode 100644 index 0000000..272568e --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/BlackPipe.cs @@ -0,0 +1,16 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingPipes; + +public class BlackPipe : DrinkingWaterHeatingPipe +{ + protected override string _title => "Black"; + protected override Dictionary<int, string> _diameterNames => new() + { + [16] = "162,2", + [20] = "202,8", + [25] = "253,5", + [32] = "324,4", + [40] = "405,5", + [50] = "506,9", + [63] = "638,6" + }; +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs new file mode 100644 index 0000000..e7a18d6 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs @@ -0,0 +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 = + new(@"([\b\D]|^)?(?<Diameter>16|20|25|32|40|50|63)([\b\D]|$)"); + protected static readonly Regex _type = + new(@"([\b\W])(?<Type>бухт|отр|штанг)([\b\w.])"); + protected virtual string _title { get; } = string.Empty; + + protected virtual Dictionary<int, string> _diameterNames { get; } = new() + { + [16] = "16x2,2", + [20] = "20x2,8", + [25] = "25x3,5", + [32] = "32x4,4", + [40] = "40x5,5", + [50] = "50x6,9", + [63] = "63x8,6" + }; + + protected virtual Dictionary<string, string> _makeUp { get; } = new() + { + ["бухт"] = "бухта", + ["штанг"] = "прям.отрезки", + ["отр"] = "прям.отрезки" + }; + + 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; + } + + 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(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["отр"]}"; + } + } +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/FlexPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/FlexPipe.cs new file mode 100644 index 0000000..4294a9a --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/FlexPipe.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingPipes; + +public class FlexPipe : DrinkingWaterHeatingPipe +{ + protected override string _title => "Flex"; +}
\ No newline at end of file diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/PinkPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/PinkPipe.cs new file mode 100644 index 0000000..284e466 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/PinkPipe.cs @@ -0,0 +1,23 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingPipes; + +public class PinkPipe : DrinkingWaterHeatingPipe +{ + protected override string _title => "Pink+"; + + protected override Dictionary<string, string> _makeUp => new() + { + ["бухт"] = "бухта", + ["штанг"] = "прямые отрезки", + ["отр"] = "прямые отрезки" + }; + protected override Dictionary<int, string> _diameterNames => new() + { + [16] = "16х2,2", + [20] = "20х2,8", + [25] = "25х3,5", + [32] = "32х4,4", + [40] = "40х5,5", + [50] = "50х6,9", + [63] = "63х8,6" + }; +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/StabilPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/StabilPipe.cs new file mode 100644 index 0000000..49dde86 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/StabilPipe.cs @@ -0,0 +1,16 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingPipes; + +public class StabilPipe : DrinkingWaterHeatingPipe +{ + protected override string _title => "Stabil -PLATINUM"; + protected override Dictionary<int, string> _diameterNames => new() + { + [16] = "16,2х2,6", + [20] = "20х2,9", + [25] = "25х3,7", + [32] = "32х4,7", + [40] = "40х6,0", + [50] = "50x6,9", + [63] = "63x8,6" + }; +} diff --git a/RhSolutions.QueryModifiers/ElbowModifier.cs b/RhSolutions.QueryModifiers/ElbowModifier.cs deleted file mode 100644 index 571fac8..0000000 --- a/RhSolutions.QueryModifiers/ElbowModifier.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Extensions; - -namespace RhSolutions.QueryModifiers -{ - public class ElbowModifier : IProductQueryModifier - { - private string diameterPattern { get; } = @"([\b\D]|^)(?<Diameter>16|20|25|32|40|50|63)([\b\D]|$)"; - private string anglePattern { get; } = @"([\b\D]|^)(?<Angle>45|90)([\b\D]|$)"; - - protected virtual string name {get;} = "Угольник RAUTITAN -PLATINUM"; - public bool TryQueryModify(IQueryCollection collection, out QueryString queryString) - { - queryString = QueryString.Empty; - var query = collection["query"].ToString(); - if (string.IsNullOrEmpty(query)) - { - return false; - } - var diameter = Regex.Match(query, diameterPattern); - if (diameter.Success) - { - var angle = Regex.Match(query, anglePattern); - QueryBuilder qb = new() - { - {"query", CreateName(angle, diameter)} - }; - queryString = qb.ToQueryString(); - return true; - } - else - { - return false; - } - } - - protected virtual string CreateName(Match angle, Match diameter) - { - return $"{name} {(angle.Success ? angle.Groups["Angle"].Captures.First() : 90)} {diameter.Groups["Diameter"].Captures.First()}"; - } - } - - public class BendFormerHeating : ElbowModifier - { - protected override string name => "Фиксатор поворота без колец"; - protected override string CreateName(Match angle, Match diameter) - { - return $"{name} {(diameter.Groups["Diameter"].Captures.First().ToString() == "16" ? "16/17" : diameter.Groups["Diameter"].Captures.First())}/{(angle.Success ? angle.Groups["Angle"].Captures.First() : 90)}°"; - } - } -} diff --git a/RhSolutions.QueryModifiers/FlexPipeQueryModifier.cs b/RhSolutions.QueryModifiers/FlexPipeQueryModifier.cs deleted file mode 100644 index 9bee225..0000000 --- a/RhSolutions.QueryModifiers/FlexPipeQueryModifier.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace RhSolutions.QueryModifiers; - -public class FlexPipeQueryModifier : PipeQueryModifier { }
\ No newline at end of file diff --git a/RhSolutions.QueryModifiers/Heating/SleeveQueryModifier.cs b/RhSolutions.QueryModifiers/Heating/SleeveQueryModifier.cs deleted file mode 100644 index 42fe898..0000000 --- a/RhSolutions.QueryModifiers/Heating/SleeveQueryModifier.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace RhSolutions.QueryModifiers.Heating; -public class SleeveQueryModifier : HeatingFittingBase -{ - protected override string _title => "Монтажная гильза"; -} diff --git a/RhSolutions.QueryModifiers/PinkPipeQueryModifier.cs b/RhSolutions.QueryModifiers/PinkPipeQueryModifier.cs deleted file mode 100644 index c76077f..0000000 --- a/RhSolutions.QueryModifiers/PinkPipeQueryModifier.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace RhSolutions.QueryModifiers; - -public class PinkPipeQueryModifier : PipeQueryModifier -{ - protected override string pipeName => "Pink+"; - protected override Dictionary<string, string> diameterNames => new() - { - ["16"] = "16х2,2", - ["20"] = "20х2,8", - ["25"] = "25х3,5", - ["32"] = "32х4,4", - ["40"] = "40х5,5", - ["50"] = "50х6,9", - ["63"] = "63х8,7" - }; - protected override Dictionary<string, string> makeUpNames => new() - { - ["бухт"] = "бухта", - ["штанг"] = "прямые отрезки", - ["отр"] = "прямые отрезки" - }; -} diff --git a/RhSolutions.QueryModifiers/PipeQueryModifier.cs b/RhSolutions.QueryModifiers/PipeQueryModifier.cs deleted file mode 100644 index 2126c55..0000000 --- a/RhSolutions.QueryModifiers/PipeQueryModifier.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Extensions; - -namespace RhSolutions.QueryModifiers; - -public class PipeQueryModifier : IProductQueryModifier -{ - protected virtual string diameterPattern { get; } = @"([\b\D]|^)(?<Diameter>16|20|25|32|40|50|63)([\b\D]|$)"; - protected virtual string typePattern { get; } = @"бухт|отр|штанг"; - protected virtual string pipeName { get; } = "Flex"; - protected virtual Dictionary<string, string> diameterNames { get; } = new() - { - ["16"] = "16x2,2", - ["20"] = "20x2,8", - ["25"] = "25x3,5", - ["32"] = "32x4,4", - ["40"] = "40x5,5", - ["50"] = "50x6,9", - ["63"] = "63x8,6" - }; - - protected virtual Dictionary<string, string> makeUpNames { get; } = new() - { - ["бухт"] = "бухта", - ["штанг"] = "прям.отрезки", - ["отр"] = "прям.отрезки" - }; - - public bool TryQueryModify(IQueryCollection collection, out QueryString queryString) - { - queryString = QueryString.Empty; - string query = collection["query"].ToString(); - if (string.IsNullOrEmpty(query)) - { - return false; - } - - var diameterMatches = Regex.Matches(query, diameterPattern); - if (diameterMatches.Count == 0) - { - return false; - } - - var typeMatches = Regex.Matches(query, typePattern); - var diameter = diameterMatches.First().Groups["Diameter"].Value; - string? type = typeMatches.FirstOrDefault()?.Value; - - string result = - $"Труба {pipeName} {diameterNames[diameter]} {(type != null ? makeUpNames[type] : int.Parse(diameter) < 32 ? makeUpNames["бухт"] : makeUpNames["отр"])}"; - - QueryBuilder qb = new() - { - { "query", result } - }; - queryString = qb.ToQueryString(); - return true; - } -} diff --git a/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs b/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs index 094b5ae..c3252ff 100644 --- a/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs +++ b/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs @@ -1,4 +1,5 @@ -using RhSolutions.QueryModifiers.Heating; +using RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; +using RhSolutions.QueryModifiers.DrinkingWaterHeatingPipes; namespace RhSolutions.QueryModifiers; @@ -9,41 +10,39 @@ public class ProductQueryModifierFactory switch (productTypeName) { case "Монтажная гильза": - return new SleeveQueryModifier(); + return new Sleeve(); case "Тройник RAUTITAN": - return new TPieceQueryModifier(); + return new TPiece(); case "Тройник RAUTITAN резьбовой наружный": return new ThreadTPieceExternal(); case "Тройник RAUTITAN резьбовой внутренний": return new ThreadTPieceInternal(); - case "Тройник RAUTITAN резьбовой настенный": - return new ThreadTPieceInternal(); case "Переходник на наружную резьбу": - return new AdapterExternalModifier(); + return new AdapterExternal(); case "Переходник на внутреннюю резьбу": - return new AdapterInternalModifier(); + return new AdapterInternal(); case "Переходник с накидной гайкой": - return new AdapterScrewcapModifier(); + return new AdapterScrewcap(); case "Угольник с наружной резьбой": - return new ThreadElbowExternalModifier(); + return new ThreadElbowExternal(); case "Угольник с внутренней резьбой": - return new ThreadElbowInternalModifier(); + return new ThreadElbowInternal(); case "Угольник с накидной гайкой": - return new ScrewcapElbowModifier(); + return new ScrewcapElbow(); case "Муфта соединительная": - return new CouplingModifier(); + return new Coupling(); case "Угольник RAUTITAN": return new ElbowModifier(); case "Фиксатор поворота без колец": return new BendFormerHeating(); case "Flex": - return new FlexPipeQueryModifier(); + return new FlexPipe(); case "Pink": - return new PinkPipeQueryModifier(); + return new PinkPipe(); case "Stabil": - return new StabilPipeQueryModifier(); + return new StabilPipe(); case "Black": - return new BlackPipeQueryModifier(); + return new BlackPipe(); default: return new BypassQueryModifier(); } diff --git a/RhSolutions.QueryModifiers/ScrewcapElbowModifier.cs b/RhSolutions.QueryModifiers/ScrewcapElbowModifier.cs deleted file mode 100644 index b83236d..0000000 --- a/RhSolutions.QueryModifiers/ScrewcapElbowModifier.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace RhSolutions.QueryModifiers; - -public class ScrewcapElbowModifier : AdapterModifier -{ - protected override string name => "Угольник-переходник с накидной гайкой"; -} diff --git a/RhSolutions.QueryModifiers/StabilPipeQueryModifier.cs b/RhSolutions.QueryModifiers/StabilPipeQueryModifier.cs deleted file mode 100644 index 2ace1f3..0000000 --- a/RhSolutions.QueryModifiers/StabilPipeQueryModifier.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace RhSolutions.QueryModifiers; - -public class StabilPipeQueryModifier : PipeQueryModifier -{ - protected override string diameterPattern => @"([\b\D]|^)(?<Diameter>16|20|25|32|40)([\b\D]|$)"; - protected override string pipeName => "Stabil -PLATINUM"; - protected override Dictionary<string, string> diameterNames => new() - { - ["16"] = "16,2х2,6", - ["20"] = "20х2,9", - ["25"] = "25х3,7", - ["32"] = "32х4,7", - ["40"] = "40х6,0" - }; -} diff --git a/RhSolutions.QueryModifiers/TPieceQueryModifier.cs b/RhSolutions.QueryModifiers/TPieceQueryModifier.cs deleted file mode 100644 index 87c5b61..0000000 --- a/RhSolutions.QueryModifiers/TPieceQueryModifier.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Extensions; -using System.Text; -using System.Text.RegularExpressions; - -namespace RhSolutions.QueryModifiers; - -public class TPieceQueryModifier : IProductQueryModifier -{ - private readonly string pattern = @"16|20|25|32|40|50|63"; - - public bool TryQueryModify(IQueryCollection collection, out QueryString queryString) - { - queryString = QueryString.Empty; - var query = collection["query"].ToString(); - if (string.IsNullOrEmpty(query)) - { - return false; - } - var matches = Regex.Matches(query, pattern); - StringBuilder sb = new(); - sb.Append("Тройник RAUTITAN -PLATINUM"); - if (matches.Count == 1) - { - sb.Append($" {matches.First().Value}-{matches.First().Value}-{matches.First().Value}"); - } - else if (matches.Count >= 3) - { - sb.Append($" {matches[0].Value}-{matches[1].Value}-{matches[2].Value}"); - } - else - { - return false; - } - QueryBuilder qb = new() - { - { "query", sb.ToString() } - }; - queryString = qb.ToQueryString(); - return true; - } -} diff --git a/RhSolutions.QueryModifiers/ThreadElbowExternalModifier.cs b/RhSolutions.QueryModifiers/ThreadElbowExternalModifier.cs deleted file mode 100644 index 3297f44..0000000 --- a/RhSolutions.QueryModifiers/ThreadElbowExternalModifier.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace RhSolutions.QueryModifiers; - -public class ThreadElbowExternalModifier : AdapterModifier -{ - protected override string name => "Угольник-переходник с наружной резьбой"; -} diff --git a/RhSolutions.QueryModifiers/ThreadElbowInternalModifier.cs b/RhSolutions.QueryModifiers/ThreadElbowInternalModifier.cs deleted file mode 100644 index 88801e7..0000000 --- a/RhSolutions.QueryModifiers/ThreadElbowInternalModifier.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace RhSolutions.QueryModifiers; - -public class ThreadElbowInternalModifier : AdapterModifier -{ - protected override string name => "Угольник-переходник с внутренней резьбой"; -} diff --git a/RhSolutions.QueryModifiers/ThreadTPieceExternal.cs b/RhSolutions.QueryModifiers/ThreadTPieceExternal.cs deleted file mode 100644 index b5c910b..0000000 --- a/RhSolutions.QueryModifiers/ThreadTPieceExternal.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Text.RegularExpressions; - -namespace RhSolutions.QueryModifiers; - -public class ThreadTPieceExternal : ThreadTPieceInternal -{ - protected override string ConstructName(MatchCollection diameters, Match thread) - { - Capture t = thread.Groups["Thread"].Captures.First(); - if (diameters.Count == 1) - { - return $"Тройник RAUTITAN с наружной резьбой {diameters[0]}-{diameters[0]}-R {t}"; - } - else - { - return $"Тройник RAUTITAN с наружной резьбой {diameters[0]}-{diameters[1]}-R {t}"; - } - } -}
\ No newline at end of file diff --git a/RhSolutions.QueryModifiers/ThreadTPieceWall.cs b/RhSolutions.QueryModifiers/ThreadTPieceWall.cs deleted file mode 100644 index 8e11a91..0000000 --- a/RhSolutions.QueryModifiers/ThreadTPieceWall.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Extensions; - -namespace RhSolutions.QueryModifiers; - -public class ThreadTPieceInternal : IProductQueryModifier -{ - private string diameterPattern = "16|20|25|32|40|50|63"; - private string threadPattern = @"(\D|^)(?<Thread>1\s+1/4|1\s+1/2|1/2|3/4|2|1)(\D|$)"; - - public bool TryQueryModify(IQueryCollection collection, out QueryString queryString) - { - queryString = QueryString.Empty; - var query = collection["query"].ToString(); - if (string.IsNullOrEmpty(query)) - { - return false; - } - var diameters = Regex.Matches(query, diameterPattern); - if (diameters.Count == 0) - { - return false; - } - var thread = Regex.Match(query, threadPattern); - if (!thread.Success) - { - return false; - } - QueryBuilder qb = new() - { - {"query", ConstructName(diameters, thread)} - }; - queryString = qb.ToQueryString(); - return true; - } - - protected virtual string ConstructName(MatchCollection diameters, Match thread) - { - Capture t = thread.Groups["Thread"].Captures.First(); - if (diameters.Count == 1) - { - if (int.Parse(diameters[0].Value) < 25) - { - return $"Тройник настенный с внутренней резьбой {diameters[0]}-Rp{t}-{diameters[0]}"; - } - else - { - return $"Тройник с внутр. резьбой на боков. проходе {diameters[0]}-Rp {t}-{diameters[0]}"; - } - } - else - { - if (int.Parse(diameters[0].Value) < 25) - { - return $"Тройник настенный с внутренней резьбой {diameters[0]}-Rp{t}-{diameters[1]}"; - } - else - { - return $"Тройник с внутр. резьбой на боков. проходе {diameters[0]}-Rp {t}-{diameters[1]}"; - } - } - } -} |