From 73275fa29eab0ddadd72d78376db6faa0655d7e3 Mon Sep 17 00:00:00 2001 From: Serghei Cebotari Date: Mon, 29 Jan 2024 12:15:25 +0300 Subject: [PATCH] Fix manifold regex --- RhSolutions.Api.Tests/RautitanFittingsTests.cs | 1 + .../DrinkingWaterHeatingFittings/ManifoldG1.cs | 2 +- .../DrinkingWaterHeatingFittings/ManifoldHLV.cs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RhSolutions.Api.Tests/RautitanFittingsTests.cs b/RhSolutions.Api.Tests/RautitanFittingsTests.cs index 550881b..49a7bbe 100644 --- a/RhSolutions.Api.Tests/RautitanFittingsTests.cs +++ b/RhSolutions.Api.Tests/RautitanFittingsTests.cs @@ -135,6 +135,7 @@ public class RautitanFittingsTests : ProductQueryModifierTests [TestCase("Распределительный коллектор G1 2 отвода G 3/4", "Распределительный коллектор G1 2")] [TestCase("Коллектор Квартирный с отсекающими кранами, латунь ДУ20, НР-ВР 3/4\", 3 контура НР 1/2", "Распределительный коллектор G1 3")] + [TestCase("Коллектор Квартирный с отсекающими кранами, латунь ДУ20, НР-ВР 3/\", 4 контура НР 1/2\"", "Распределительный коллектор G1 4")] public void ManifoldG1Test(string query, string modified) => Invoke(productType: "Коллектор G1", query, modified); diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs index ec3ba93..5e364a8 100644 --- a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs +++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs @@ -6,7 +6,7 @@ namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings; public class ManifoldG1 : DrinkingWaterHeatingFitting { private static readonly Regex _portsCount = - new(@"\b(?\d{1})\b"); + new(@"\s(?\d{1})\s"); protected override string _title => "Распределительный коллектор G1"; diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs index ce8dfe6..4b895fd 100644 --- a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs +++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs @@ -5,7 +5,7 @@ namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings; [MLModifierKey("Коллектор HLV")] public class ManifoldHLV : DrinkingWaterHeatingFitting { private static readonly Regex _portsCount = - new(@"\b(?\d{1,2})\b"); + new(@"\s(?\d{1,2})\s"); protected override string _title => "Распределительный коллектор HLV";