diff options
4 files changed, 20 insertions, 19 deletions
diff --git a/RhSolutions.Api.Tests/RautitanFittingsTests.cs b/RhSolutions.Api.Tests/RautitanFittingsTests.cs index 983467b..440d5d2 100644 --- a/RhSolutions.Api.Tests/RautitanFittingsTests.cs +++ b/RhSolutions.Api.Tests/RautitanFittingsTests.cs @@ -57,6 +57,6 @@ public class RautitanFittingsTests : ProductQueryModifierTests [TestCase("Фиксатор поворота с кольцами 90°, 32", "Фиксатор поворота с кольцами 90° 32")] [TestCase("Фиксатор поворота с кольцами 45°, 16", "Фиксатор поворота с кольцами 45° 16")] - public void BendFormerDrinkingTest(string query, string modified) + public void BendFormerSanitaryTest(string query, string modified) => Execute(productType: "Фиксатор поворота водоснабжение", query, modified); } diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs index b20b76e..6785e7e 100644 --- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs @@ -20,20 +20,3 @@ public class BendFormerHeating : DrinkingWaterHeatingFitting return $"{_title} {diameter}/{angle}°"; } } - -public class BendFormerDrinking : 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; - var angleMatch = _angle.Match(query); - string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90"; - return $"{_title} {angle}° {diameter}"; - } -} diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs new file mode 100644 index 0000000..0ba0ca6 --- /dev/null +++ b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs @@ -0,0 +1,18 @@ +namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings; + +public class BendFormerSanitary : 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; + var angleMatch = _angle.Match(query); + string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90"; + return $"{_title} {angle}° {diameter}"; + } +} diff --git a/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs b/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs index f3d1485..aa5e273 100644 --- a/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs +++ b/RhSolutions.QueryModifiers/ProductQueryModifierFactory.cs @@ -36,7 +36,7 @@ public class ProductQueryModifierFactory case "Фиксатор поворота отопление": return new BendFormerHeating(); case "Фиксатор поворота водоснабжение": - return new BendFormerDrinking(); + return new BendFormerSanitary(); case "Flex": return new FlexPipe(); case "Pink": |