summaryrefslogtreecommitdiff
path: root/RhSolutions.QueryModifiers
diff options
context:
space:
mode:
authorSerghei Cebotari <serghei@cebotari.ru>2024-01-26 15:50:41 +0300
committerSerghei Cebotari <serghei@cebotari.ru>2024-01-26 15:50:41 +0300
commita0a1c23c4d313d7c78b7cc6b7d6a108c3dad04ca (patch)
treebb59790dd64ced3a9470ff9a4c64e1f3fbbc2fdb /RhSolutions.QueryModifiers
parent2befa6a2a06c2cb719fb4b91f99eca6cd9a565de (diff)
Add ML Modifiers with attribute
Diffstat (limited to 'RhSolutions.QueryModifiers')
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Adapter.cs23
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterInternal.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterScrewcap.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs24
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs21
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs26
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs29
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs30
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DummyPlug.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Elbow.cs21
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Eurocone.cs22
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs19
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeConnectionBend.cs10
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeFlex.cs10
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeStabil.cs10
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Nippel.cs10
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Sleeve.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/SupportingClip.cs23
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs27
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowDoubleWallInternal.cs31
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowInternal.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs25
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallInternal.cs29
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs29
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs41
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/BlackPipe.cs16
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs56
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/FlexPipe.cs6
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/PinkPipe.cs23
-rw-r--r--RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/StabilPipe.cs16
-rw-r--r--RhSolutions.QueryModifiers/IProductQueryModifier.cs6
-rw-r--r--RhSolutions.QueryModifiers/RhSolutions.QueryModifiers.csproj13
36 files changed, 0 insertions, 650 deletions
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Adapter.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Adapter.cs
deleted file mode 100644
index 2956fd1..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Adapter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public abstract class Adapter : DrinkingWaterHeatingFitting
-{
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- Match diameter = _diameter.Match(input);
- if (!diameter.Success)
- {
- return false;
- }
- Match thread = _thread.Match(input);
- if (!thread.Success)
- {
- return false;
- }
- output = $"{_title} {diameter.Groups["Diameter"]} {thread.Groups["Thread"]}";
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs
deleted file mode 100644
index 8356c59..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 56e36f1..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterInternal.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 43fa639..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/AdapterScrewcap.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index b0269a6..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class BendFormerHeating : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Фиксатор поворота";
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (!diameterMatch.Success)
- {
- return false;
- }
- string diameter = diameterMatch.Groups["Diameter"].Value;
- if (diameter == "16")
- {
- diameter += "/17";
- }
- var angleMatch = _angle.Match(input);
- string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
- output = $"{_title} {diameter}/{angle}°";
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs
deleted file mode 100644
index 0290ef8..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class BendFormerSanitary : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Фиксатор поворота с кольцами";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (!diameterMatch.Success)
- {
- return false;
- }
- string diameter = diameterMatch.Groups["Diameter"].Value;
- var angleMatch = _angle.Match(input);
- string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
- output = $"{_title} {angle}° {diameter}";
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs
deleted file mode 100644
index 0ff72d7..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-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]|^)?(?<Diameter>16|20|25)(\D+|.*15.*)(?<Length>\b\d{3,4})([\b\D]|$)");
- protected override string _title => "Трубка Г-образная";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var match = _pattern.Match(input);
- if (!match.Success)
- {
- return false;
- }
- string diameter = match.Groups["Diameter"].Value;
- int length = int.Parse(match.Groups["Length"].Value);
- int nearest = lengths.OrderBy(x => Math.Abs(x - length)).First();
- output = $"{_title} {diameter}/{nearest}";
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs
deleted file mode 100644
index 77c0204..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class ConnectionTee : ConnectionBend
-{
- protected override string _title => "Трубка Т-образная";
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs
deleted file mode 100644
index 8ae446c..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Coupling.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class Coupling : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Муфта соединительная";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diametersMatches = _diameter.Matches(input);
- if (diametersMatches.Count == 0)
- {
- return false;
- }
- var diameters = diametersMatches.Select(x => x.Groups["Diameter"].Value)
- .Take(2)
- .OrderByDescending(x => int.Parse(x))
- .ToArray();
- if (diameters.Length == 1 || diameters[0] == diameters[1])
- {
- output = $"{_title} равнопроходная {diameters[0]}";
- }
- else
- {
- output = $"{_title} переходная {diameters[0]}-{diameters[1]}";
- }
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
deleted file mode 100644
index 0d635b1..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public abstract class DrinkingWaterHeatingFitting : IProductQueryModifier
-{
- protected static readonly Regex _diameter =
- 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]|$)");
- 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]|$)");
-
- protected virtual string _title { get; } = string.Empty;
-
- public virtual bool TryQueryModify(string input, out string output)
- {
- var match = _diameter.Match(input);
- if (match.Success)
- {
- output = $"{_title} {match.Groups["Diameter"]}";
- return true;
- }
- else
- {
- output = string.Empty;
- return false;
- }
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DummyPlug.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DummyPlug.cs
deleted file mode 100644
index f29bc24..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/DummyPlug.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class DummyPlug : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Заглушка для полимерн. трубы";
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Elbow.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Elbow.cs
deleted file mode 100644
index bb700b6..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Elbow.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class Elbow : DrinkingWaterHeatingFitting
-{
- protected override string _title { get; } = "Угольник -PLATINUM";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (!diameterMatch.Success)
- {
- return false;
- }
- string diameter = diameterMatch.Groups["Diameter"].Value;
- var angleMatch = _angle.Match(input);
- string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
- output = $"{_title} {angle} {diameter}";
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Eurocone.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Eurocone.cs
deleted file mode 100644
index 00047f3..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Eurocone.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public abstract class Eurocone : DrinkingWaterHeatingFitting
-{
- protected virtual Dictionary<string, string> _titles { get; } = new();
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (diameterMatch.Success)
- {
- string diameter = diameterMatch.Groups["Diameter"].Value;
- if (_titles.TryGetValue(diameter, out string? title))
- {
- output = title;
- return true;
- }
- }
- return false;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs
deleted file mode 100644
index 7f779f4..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class EuroconeAdapter : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Переходник на евроконус";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (diameterMatch.Success)
- {
- string diameter = diameterMatch.Groups["Diameter"].Value;
- output = $"{_title} {diameter}-G 3/4";
- return true;
- }
- return false;
- }
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeConnectionBend.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeConnectionBend.cs
deleted file mode 100644
index 554c346..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeConnectionBend.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class EuroconeConnectionBend : DrinkingWaterHeatingFitting
-{
- public override bool TryQueryModify(string input, out string output)
- {
- output = "Резьбозажимное соединение для металлической трубки G 3/4 -15";
- return true;
- }
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeFlex.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeFlex.cs
deleted file mode 100644
index 382e775..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeFlex.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class EuroconeFlex : Eurocone
-{
- protected override Dictionary<string, string> _titles => new()
- {
- ["16"] = "Резьбозажимное соединение flex/pink 16х2,2xG3/4",
- ["20"] = "Резьбозажимное соединение flex/pink 20х2,8xG3/4"
- };
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeStabil.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeStabil.cs
deleted file mode 100644
index bc7c34d..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/EuroconeStabil.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class EuroconeStabil : Eurocone
-{
- protected override Dictionary<string, string> _titles => new()
- {
- ["16"] = "Резьбозажимное соединение stabil 16,2x2,6xG3/4",
- ["20"] = "Резьбозажимное соединение stabil 20x2,9xG3/4"
- };
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Nippel.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Nippel.cs
deleted file mode 100644
index 6c61184..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Nippel.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class Nippel : DrinkingWaterHeatingFitting
-{
- public override bool TryQueryModify(string input, out string output)
- {
- output = "К-т двух резьбозажим. нипелей с нар.резьбой 1/2х3/4";
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs
deleted file mode 100644
index 97e2fb7..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index c546236..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/Sleeve.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class Sleeve : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Монтажная гильза";
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/SupportingClip.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/SupportingClip.cs
deleted file mode 100644
index 54eade9..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/SupportingClip.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class SupportingClip : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Фиксирующий желоб для ПЭ-трубы";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (diameterMatch.Success)
- {
- string diameter = diameterMatch.Groups["Diameter"].Value;
- if (diameter == "16")
- {
- diameter += "/17";
- }
- output = $"{_title} {diameter}";
- return true;
- }
- return false;
- }
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs
deleted file mode 100644
index e25f4c2..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/TPiece.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class TPiece : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Тройник -PLATINUM";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameters = _diameter.Matches(input)
- .Select(match => match.Groups["Diameter"].Value)
- .ToArray();
- if (diameters.Length == 1)
- {
- output = $"{_title} {diameters[0]}-{diameters[0]}-{diameters[0]}";
- }
- else if (diameters.Length >= 3)
- {
- output = $"{_title} {diameters[0]}-{diameters[1]}-{diameters[2]}";
- }
- else
- {
- return false;
- }
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowDoubleWallInternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowDoubleWallInternal.cs
deleted file mode 100644
index d6772bf..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowDoubleWallInternal.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class ThreadElbowDoubleWallInternal : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Проточный настенный угольник";
- private Regex _type = new(@"([\b\Wу])(?<Type>длин)([\b\w\.\s])");
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatches = _diameter.Matches(input);
- if (diameterMatches.Count == 0)
- {
- return false;
- }
- var threadMatch = _thread.Match(input);
- if (!threadMatch.Success)
- {
- return false;
- }
- var typeMatch = _type.Match(input);
- string[] diameters = diameterMatches.Select(x => x.Groups["Diameter"].Value).ToArray();
- string thread = threadMatch.Groups["Thread"].Value;
- string type = typeMatch.Success ? "длинный" : "короткий";
-
- output = $"{_title} {diameters[0]}/{(diameters.Length > 1 ? diameters[1] : diameters[0])}-Rp {thread} {type}";
- return true;
- }
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs
deleted file mode 100644
index 010fcc2..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 187f66d..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowInternal.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class ThreadElbowInternal : Adapter
-{
- protected override string _title => "Угольник-переходник с внутренней резьбой";
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs
deleted file mode 100644
index c8edfab..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class ThreadElbowWallExternal : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Угольник настенный с наружной резьбой";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (!diameterMatch.Success)
- {
- return false;
- }
- var threadMatch = _thread.Match(input);
- if (!threadMatch.Success)
- {
- return false;
- }
- string diameter = diameterMatch.Groups["Diameter"].Value;
- string thread = threadMatch.Groups["Thread"].Value;
- output = $"{_title} {diameter}-R {thread}";
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallInternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallInternal.cs
deleted file mode 100644
index 6450796..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallInternal.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class ThreadElbowWallInternal : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Угольник настенный внутр. резьба";
- private Regex _type = new(@"([\b\Wу])(?<Type>длин)([\b\w\.\s])");
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (!diameterMatch.Success)
- {
- return false;
- }
- var threadMatch = _thread.Match(input);
- if (!threadMatch.Success)
- {
- return false;
- }
- var typeMatch = _type.Match(input);
- string diameter = diameterMatch.Groups["Diameter"].Value;
- string thread = threadMatch.Groups["Thread"].Value;
- output = $"{_title} {(typeMatch.Success ? "длинный " : string.Empty)}{diameter}-Rp {thread}";
- return true;
- }
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs
deleted file mode 100644
index 52f68b4..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class ThreadTPieceExternal : DrinkingWaterHeatingFitting
-{
- protected override string _title => "Тройник с наружной резьбой";
-
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- MatchCollection diametersMatches = _diameter.Matches(input);
- if (diametersMatches.Count == 0)
- {
- return false;
- }
- string thread = _thread.Match(input).Groups["Thread"].Value;
- int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
- if (diameters.Length == 1)
- {
- output = $"{_title} {diameters[0]}-{diameters[0]}-R {thread}";
- }
- else
- {
- output = $"{_title} {diameters[0]}-{diameters[1]}-R {thread}";
- }
- return true;
- }
-} \ No newline at end of file
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs
deleted file mode 100644
index 3b81026..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingFittings;
-
-public class ThreadTPieceInternal : DrinkingWaterHeatingFitting
-{
- public override bool TryQueryModify(string input, out string output)
- {
- output = string.Empty;
- MatchCollection diametersMatches = _diameter.Matches(input);
- if (diametersMatches.Count == 0)
- {
- return false;
- }
- string thread = _thread.Match(input).Groups["Thread"].Value;
- int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
- if (diameters.Length == 1)
- {
- if (diameters[0] < 25)
- {
- output = $"Тройник настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[0]}";
- }
- else
- {
- output = $"Тройник с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[0]}";
- }
- }
- else
- {
- if (diameters[0] < 25)
- {
- output = $"Тройник настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[1]}";
- }
- else
- {
- output = $"Тройник с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[1]}";
- }
- }
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/BlackPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/BlackPipe.cs
deleted file mode 100644
index b715cc1..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/BlackPipe.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace RhSolutions.QueryModifiers.DrinkingWaterHeatingPipes;
-
-public class BlackPipe : DrinkingWaterHeatingPipe
-{
- protected override string _title => "Black";
- protected override Dictionary<int, string> _diameterNames => new()
- {
- [16] = "16х2,2",
- [20] = "20х2,8",
- [25] = "25х3,5",
- [32] = string.Empty,
- [40] = string.Empty,
- [50] = string.Empty,
- [63] = string.Empty
- };
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs
deleted file mode 100644
index 1420d03..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/DrinkingWaterHeatingPipe.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Text.RegularExpressions;
-
-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\.\s])");
- 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(string input, out string output)
- {
- output = string.Empty;
- var diameterMatch = _diameter.Match(input);
- if (!diameterMatch.Success)
- {
- return false;
- }
- var diameter = int.Parse(diameterMatch.Groups["Diameter"].Value);
- var typeMatch = _type.Match(input);
- if (typeMatch.Success)
- {
- var type = typeMatch.Groups["Type"].Value;
- output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp[type]}";
- }
- else if (diameter < 32)
- {
- output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp["бухт"]}";
- }
- else
- {
- output = $"Труба {_title} {_diameterNames[diameter]} {_makeUp["отр"]}";
- }
- return true;
- }
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/FlexPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/FlexPipe.cs
deleted file mode 100644
index 4294a9a..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/FlexPipe.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 295744f..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/PinkPipe.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-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,7"
- };
-}
diff --git a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/StabilPipe.cs b/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/StabilPipe.cs
deleted file mode 100644
index 49dde86..0000000
--- a/RhSolutions.QueryModifiers/DrinkingWaterHeatingPipes/StabilPipe.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-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/IProductQueryModifier.cs b/RhSolutions.QueryModifiers/IProductQueryModifier.cs
deleted file mode 100644
index bf790ef..0000000
--- a/RhSolutions.QueryModifiers/IProductQueryModifier.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace RhSolutions.QueryModifiers;
-
-public interface IProductQueryModifier
-{
- public bool TryQueryModify(string query, out string queryModified);
-}
diff --git a/RhSolutions.QueryModifiers/RhSolutions.QueryModifiers.csproj b/RhSolutions.QueryModifiers/RhSolutions.QueryModifiers.csproj
deleted file mode 100644
index e20e8ff..0000000
--- a/RhSolutions.QueryModifiers/RhSolutions.QueryModifiers.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <FrameworkReference Include="Microsoft.AspNetCore.App" />
- </ItemGroup>
-
-</Project>