chebser/RhSolutions-Api
0
0
Fork 0
Code Packages Wiki

Improve fittings regex
All checks were successful
Test and release / test (push) Successful in 2m50s
Details
Test and release / release-image (push) Successful in 5m9s
Details

Browse Source
This commit is contained in:
Serghei Cebotari 2024-04-26 21:55:54 +03:00
parent 2890ec8df8
commit 29d7096786
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RhSolutions.Parsers.Tests/RautitanFittingsTests.cs
View File

@ -22,6 +22,7 @@ public class RautitanFittingsTests : ProductParsersTests
[TestCase("Тройник 20-16-16", "Тройник -PLATINUM 20-16-16")]
[TestCase("Тройник 20x16x16", "Тройник -PLATINUM 20-16-16")]
[TestCase("Тройник 20-16-25", "Тройник -PLATINUM 25-16-20")]
[TestCase("SFA-0014-251620 STOUT Тройник переходной 25x16x20 для труб 12", "Тройник -PLATINUM 25-16-20")]
public void TPieceTest(string query, string modified)
=> Invoke(productType: "Тройник RAUTITAN", query, modified);
@ -35,6 +36,7 @@ public class RautitanFittingsTests : ProductParsersTests
[TestCase("Переходник с внутренней резьбой 16xG 3/4\" для труб из сшитого полиэтилена аксиальный", "Переходник с внутренней резьбой -угольник-переходник 16 3/4")]
[TestCase("Переходник на внутреннюю резьбу 20", "Переходник с внутренней резьбой -угольник-переходник 20 1/2")]
[TestCase("32 Соединение прямое с внутренней резьбой, 40 х 1 1/2", "Переходник с внутренней резьбой -угольник-переходник 40 1 1/2")]
public void AdapterInternalTest(string query, string modified)
=> Invoke(productType: "Переходник на внутреннюю резьбу", query, modified);

6
RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
View File

@ -5,11 +5,11 @@ namespace RhSolutions.Parsers.Fittings;
public abstract class DrinkingWaterHeatingFitting : IProductParser
{
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(@"([\b\D])(?<Thread>1\s+1/4|1\s+1/2|1/2|3/4|2|1)([\b\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;