From f217b8dc51e10578e9134a1af5491b4ccf329ba1 Mon Sep 17 00:00:00 2001
From: Mikhail Kuznetsov <ivc_kuznetsovmv@dvgd.rzd>
Date: Tue, 13 Feb 2024 15:28:32 +1000
Subject: [PATCH] =?UTF-8?q?fix(dall,=20orderLoader):=20=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=B5=20PrefixWithoutVariable.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.DAL/Contracts/SettingsFromDb.cs    | 7 ++++++-
 PARR.DAL/Models/ApplicationsInWork.cs   | 4 ++--
 PARR.DAL/ParrDalInstaller.cs            | 2 +-
 PARR.DAL/Settings/PrefixSettings.cs     | 5 ++++-
 PARR.EsppOrderLoader/EsppOrderLoader.cs | 9 +++++----
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/PARR.DAL/Contracts/SettingsFromDb.cs b/PARR.DAL/Contracts/SettingsFromDb.cs
index 32dfcb46..07e21a61 100644
--- a/PARR.DAL/Contracts/SettingsFromDb.cs
+++ b/PARR.DAL/Contracts/SettingsFromDb.cs
@@ -24,10 +24,15 @@
         public string Category { get; set; } = string.Empty;
 
         /// <summary>
-        /// Префикс имени шаблона в ЕСПП
+        /// Префикс имени шаблона в ЕСПП с динамичным префиксом %PREFIX%-
         /// </summary>
         public string TemplatePrefixName { get; set; } = string.Empty;
 
+        /// <summary>
+        /// Префикс имени шаблона в ЕСПП без динамичного префикса (используется для подстановки в полное описание наряда/шаблона)
+        /// </summary>
+        public string TemplatePrefixWithoutVariable => TemplatePrefixName.Replace("%PREFIX%-", "");
+
         /// <summary>
         /// Количество попыток выполнения задания роботом
         /// </summary>
diff --git a/PARR.DAL/Models/ApplicationsInWork.cs b/PARR.DAL/Models/ApplicationsInWork.cs
index 2796cd7d..57fa9233 100644
--- a/PARR.DAL/Models/ApplicationsInWork.cs
+++ b/PARR.DAL/Models/ApplicationsInWork.cs
@@ -57,12 +57,12 @@ namespace PARR.DAL.Models
             get
             {
                 //В полное описание подставляем префикс, для дальнейшего поиска наряда
-                return $"{_fullDescription} \r\n{PrefixSettings.Prefix}";
+                return $"{_fullDescription} \r\n{PrefixSettings.PrefixWithoutVariable}";
             }
             set
             {
                 //удаляем префикс, если он есть
-                _fullDescription = value.Replace($"\r\n{PrefixSettings.Prefix}", "");
+                _fullDescription = value.Replace($"\r\n{PrefixSettings.PrefixWithoutVariable}", "");
             }
         }
 
diff --git a/PARR.DAL/ParrDalInstaller.cs b/PARR.DAL/ParrDalInstaller.cs
index e2678ee2..d45f81c1 100644
--- a/PARR.DAL/ParrDalInstaller.cs
+++ b/PARR.DAL/ParrDalInstaller.cs
@@ -91,7 +91,7 @@ namespace PARR.DAL
             configuration.GetSection(nameof(SettingsFromDb)).Bind(settingsFromDb);
             services.AddSingleton(settingsFromDb);
 
-            PrefixSettings.Prefix = settingsFromDb.TemplatePrefixName;
+            PrefixSettings.PrefixWithoutVariable = settingsFromDb.TemplatePrefixWithoutVariable;
         }
 
     }
diff --git a/PARR.DAL/Settings/PrefixSettings.cs b/PARR.DAL/Settings/PrefixSettings.cs
index ab016935..98606842 100644
--- a/PARR.DAL/Settings/PrefixSettings.cs
+++ b/PARR.DAL/Settings/PrefixSettings.cs
@@ -5,6 +5,9 @@
     /// </summary>
     internal static class PrefixSettings
     {
-        public static string Prefix = "default value";
+        /// <summary>
+        /// Префикс без динамической приставки
+        /// </summary>
+        public static string PrefixWithoutVariable = "default value";
     }
 }
diff --git a/PARR.EsppOrderLoader/EsppOrderLoader.cs b/PARR.EsppOrderLoader/EsppOrderLoader.cs
index 8438e3cd..7a2c9041 100644
--- a/PARR.EsppOrderLoader/EsppOrderLoader.cs
+++ b/PARR.EsppOrderLoader/EsppOrderLoader.cs
@@ -90,12 +90,13 @@ namespace PARR.EsppOrderLoader
 
         private async Task<IEnumerable<EsppOrder>?> GetOrdersAsync()
         {
-            var searchQuery = new FindOrdersQuery { 
-                DescriptionContains = settingsFromDb.TemplatePrefixName, 
-                GenerateDateStart = DateTimeOffset.UtcNow.DateTime.Add(-settingsFromDb.OrderSearchDeltaDate), 
+            var searchQuery = new FindOrdersQuery
+            {
+                DescriptionContains = settingsFromDb.TemplatePrefixWithoutVariable,
+                GenerateDateStart = DateTimeOffset.UtcNow.DateTime.Add(-settingsFromDb.OrderSearchDeltaDate),
                 GenerateDateEnd = DateTimeOffset.UtcNow.DateTime
             };
-            
+
             var downloadResult = await esppApiService.FindOrdersAsync(searchQuery);
 
             if (!downloadResult.IsSuccess)