From 59db8fa312b3b374bb81c367c497dd3c92470adf Mon Sep 17 00:00:00 2001
From: Mikhail Kuznetsov <ivc_kuznetsovmv@dvgd.rzd>
Date: Tue, 24 Oct 2023 13:41:57 +1000
Subject: [PATCH] =?UTF-8?q?fix(esppApi):=20FindOrdersQuery=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BA=20=D0=BD=D0=B0=D1=80=D1=8F=D0=B4=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=BE=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=20=D1=81=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B6=D0=B8=D0=BC=D0=BE=D0=BC=D1=83=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=80=D0=BE=D0=B1=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.EsppApi/EsppApiService.cs               |  8 ++++----
 PARR.EsppApi/Models/Query/FindOrdersQuery.cs | 12 +++---------
 PARR.Test/Worker.cs                          |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/PARR.EsppApi/EsppApiService.cs b/PARR.EsppApi/EsppApiService.cs
index 0c30ff3f..1646b26d 100644
--- a/PARR.EsppApi/EsppApiService.cs
+++ b/PARR.EsppApi/EsppApiService.cs
@@ -22,10 +22,10 @@ namespace PARR.EsppApi
         {
             var conditions = new List<string>();
 
-            if (!string.IsNullOrEmpty(query.ShortDescriptionContains))
-                conditions.Add($"title like \"*{query.ShortDescriptionContains}*\"");
-            if (!string.IsNullOrEmpty(query.TemplateNameContains))
-                conditions.Add($"templateName like \"*{query.TemplateNameContains}*\"");
+            if (!string.IsNullOrEmpty(query.DescriptionContains))
+                conditions.Add($"description like \"*{query.DescriptionContains}*\"");
+            //if (!string.IsNullOrEmpty(query.TemplateNameContains))
+            //    conditions.Add($"templateName like \"*{query.TemplateNameContains}*\"");
             if (query.GenerateDateStart.HasValue)
                 conditions.Add($"open.time>='{query.GenerateDateStart.Value.Day}/{query.GenerateDateStart.Value.Month}/{query.GenerateDateStart.Value.Year}" +
                     $" {query.GenerateDateStart.Value.Hour}:{query.GenerateDateStart.Value.Minute}:{query.GenerateDateStart.Value.Second}'");
diff --git a/PARR.EsppApi/Models/Query/FindOrdersQuery.cs b/PARR.EsppApi/Models/Query/FindOrdersQuery.cs
index ca1a8d05..ae918f5b 100644
--- a/PARR.EsppApi/Models/Query/FindOrdersQuery.cs
+++ b/PARR.EsppApi/Models/Query/FindOrdersQuery.cs
@@ -8,23 +8,17 @@
         //todo: тут поля для запроса списка нарядов из еспп
 
         /// <summary>
-        /// Краткое описание, содержит значение
+        /// Подробное описание, содержит значение
         /// </summary>
-        public string? ShortDescriptionContains { get; set; }
-
-        /// <summary>
-        /// Шаблон, содержит значение
-        /// </summary>
-        public string? TemplateNameContains { get; set; }
+        public string? DescriptionContains { get; set; }
 
         /// <summary>
         /// Дата сначала которой выбирать созданные наряды
         /// </summary>
         public DateTime? GenerateDateStart { get; set; }
 
-
         /// <summary>
-        /// Дата конца периода до которого выбирать созданные наряды
+        /// Дата конца периода до которого создавались наряды
         /// </summary>
         public DateTime? GenerateDateEnd { get; set; }
     }
diff --git a/PARR.Test/Worker.cs b/PARR.Test/Worker.cs
index ba087d6b..8622e736 100644
--- a/PARR.Test/Worker.cs
+++ b/PARR.Test/Worker.cs
@@ -28,7 +28,7 @@ namespace PARR.Test
 
         private async Task TestEsppApi()
         {
-            var result = await esppApiService.FindOrdersAsync(new FindOrdersQuery { ShortDescriptionContains = "описание", GenerateDateStart = new DateTime(2023, 10, 10) , GenerateDateEnd = new DateTime(2023, 10, 24) });
+            var result = await esppApiService.FindOrdersAsync(new FindOrdersQuery { DescriptionContains = "Полное", GenerateDateStart = new DateTime(2023, 10, 10) , GenerateDateEnd = new DateTime(2023, 10, 24) });
 
             if (result.IsSuccess)
             {