From 06c520633e9ee86f12e8d5ae6942afd5bcb66554 Mon Sep 17 00:00:00 2001 From: Serghei Cebotari Date: Fri, 13 Oct 2023 23:38:28 +0300 Subject: [PATCH] Add connection bend and tee --- .../RautitanFittingsTests.cs | 10 ++++++++ .../ConnectionBend.cs | 24 +++++++++++++++++++ .../ConnectionTee.cs | 6 +++++ .../ProductQueryModifierFactory.cs | 4 ++++ 4 files changed, 44 insertions(+) create mode 100644 RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs create mode 100644 RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs diff --git a/RhSolutions.Api.Tests/RautitanFittingsTests.cs b/RhSolutions.Api.Tests/RautitanFittingsTests.cs index a4a16c8..b9dfa62 100644 --- a/RhSolutions.Api.Tests/RautitanFittingsTests.cs +++ b/RhSolutions.Api.Tests/RautitanFittingsTests.cs @@ -69,4 +69,14 @@ public class RautitanFittingsTests : ProductQueryModifierTests [TestCase("Уголок с настенным креплением, удлиненный, 16 х 1/2'', бронза", "Угольник настенный внутр. резьба длинный 16-Rp 1/2")] public void ThreadElbowWallInternalTest(string query, string modified) => Execute(productType: "Угольник настенный внутренний", query, modified); + + [TestCase("Трубка из. нерж. стали для подкл. радиатора, Г-образная 16/250", "Трубка Г-образная 16/250")] + [TestCase("Монтажная трубка для радиатора, конечная, 16 х 15 х 300 мм", "Трубка Г-образная 16/250")] + public void ConnectionBendTest(string query, string modified) + => Execute(productType: "Трубка Г-образная", query, modified); + + [TestCase("Трубка из. нерж. стали для подкл. радиатора, Т-образная 16/250", "Трубка Т-образная 16/250")] + [TestCase("Монтажная трубка для радиатора, проходная 20 х 15 х 300 мм", "Трубка Т-образная 20/250")] + public void ConnectionTeeTest(string query, string modified) + => Execute(productType: "Трубка Т-образная", query, modified); } diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs new file mode 100644 index 0000000..e70fb00 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs @@ -0,0 +1,24 @@ +using System.Text.RegularExpressions; + +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class ConnectionBend : DrinkingWaterHeatingFitting +{ + private static readonly int[] lengths = new [] { 250, 500, 1000 }; + private static readonly Regex _pattern = + new(@"([\b\D]|^)?(?16|20|25)(\D+|.*15.*)(?\b\d{3,4})([\b\D]|$)"); + protected override string _title => "Трубка Г-образная"; + + protected override string? BuildRhSolutionsName(string query) + { + var match = _pattern.Match(query); + if (!match.Success) + { + 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(); + return $"{_title} {diameter}/{nearest}"; + } +} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs new file mode 100644 index 0000000..77c0204 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs @@ -0,0 +1,6 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class ConnectionTee : ConnectionBend +{ + protected override string _title => "Трубка Т-образная"; +} \ No newline at end of file diff --git a/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs b/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs index 39d1bbb..18b9d00 100644 --- a/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs +++ b/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs @@ -41,6 +41,10 @@ public class ProductQueryModifierFactory return new BendFormerHeating(); case "Фиксатор поворота водоснабжение": return new BendFormerSanitary(); + case "Трубка Г-образная": + return new ConnectionBend(); + case "Трубка Т-образная": + return new ConnectionTee(); case "Flex": return new FlexPipe(); case "Pink":