From 9e0f1186fc1a694790067df7192a21e5574e9b6a Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Tue, 1 Jun 2021 16:06:03 +0300
Subject: [PATCH] remove kladr sub request

---
 .../Managers/Insurance/PreRequestManager.cs   | 27 ++-----------------
 ELT.Client/Models/Insurance/Preparams.cs      |  3 +--
 .../Controllers/InsuranceController/Kasko.cs  |  3 +--
 .../Controllers/InsuranceController/Osago.cs  |  5 ++--
 4 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/ELT.Client/Managers/Insurance/PreRequestManager.cs b/ELT.Client/Managers/Insurance/PreRequestManager.cs
index 80d8b90..4c51f32 100644
--- a/ELT.Client/Managers/Insurance/PreRequestManager.cs
+++ b/ELT.Client/Managers/Insurance/PreRequestManager.cs
@@ -16,31 +16,8 @@ namespace ELT.Client.Managers.Insurance
         public ELTPreData GetPreRequestData(Preparams preparams)
         {
             var eltPreData = new ELTPreData();
-            //KLADR
-            var kladr = "0";
-            var eltRegions = _eltKaskoSoap.GetRegionsExt(new GetRegionsExtRequest());
-            var eltRegion = eltRegions.GetRegionsExtResult.FirstOrDefault(x =>
-                x.Name.Contains(preparams.RegionName.Split(" ")[0])
-            );
-            if (eltRegion != null)
-            {
-                if (eltRegion.Kladr != null)
-                {
-                    kladr = eltRegion.Kladr;
-                }
-                else
-                {
-                    if (eltRegion.Id != null)
-                    {
-                        var eltCities = _eltKaskoSoap.GetCitiesExt(new GetCitiesExtRequest {RegionId = eltRegion.Id});
-                        var eltCity = eltCities.GetCitiesExtResult.FirstOrDefault(x =>
-                            x.Name.Contains(preparams.CityName.Split(" ")[0]));
-                        if (eltCity != null) kladr = eltCity.Kladr;
-                    }
-                }
-            }
-
-            eltPreData.Kladr = kladr;
+            
+            eltPreData.Kladr = preparams.Kladr;
             //KLADR
 
             //CAR
diff --git a/ELT.Client/Models/Insurance/Preparams.cs b/ELT.Client/Models/Insurance/Preparams.cs
index 2d7543d..17cb34a 100644
--- a/ELT.Client/Models/Insurance/Preparams.cs
+++ b/ELT.Client/Models/Insurance/Preparams.cs
@@ -2,8 +2,7 @@
 {
     public class Preparams
     {
-        public string RegionName { get; set; }
-        public string CityName { get; set; }
+        public string Kladr { get; set; }
         public string BrandId { get; set; }
         public string ModelId { get; set; }
     }
diff --git a/ELT.Tests/Controllers/InsuranceController/Kasko.cs b/ELT.Tests/Controllers/InsuranceController/Kasko.cs
index 6f51cde..5e56745 100644
--- a/ELT.Tests/Controllers/InsuranceController/Kasko.cs
+++ b/ELT.Tests/Controllers/InsuranceController/Kasko.cs
@@ -18,8 +18,7 @@ namespace ELT.Tests.Controllers.InsuranceController
                 CompanyIds = new[] { TARGET_INSURANCE_COMPANY },
                 Preparams = new Preparams
                 {
-                    RegionName = "Рязанская обл",
-                    CityName = "Рязань г",
+                    Kladr = "6200000100000",
                     BrandId = "C3B16998-C04D-484C-A17E-DB2C8FFE6DF3",
                     ModelId = "29DF0E37-1431-4037-AC0A-0FCA37AD0792"
                 },
diff --git a/ELT.Tests/Controllers/InsuranceController/Osago.cs b/ELT.Tests/Controllers/InsuranceController/Osago.cs
index 7b5f104..f65b276 100644
--- a/ELT.Tests/Controllers/InsuranceController/Osago.cs
+++ b/ELT.Tests/Controllers/InsuranceController/Osago.cs
@@ -18,8 +18,7 @@ namespace ELT.Tests.Controllers.InsuranceController
                 CompanyIds = new[] { TARGET_INSURANCE_COMPANY },
                 Preparams = new Preparams
                 {
-                    RegionName = "Рязанская обл",
-                    CityName = "Рязань г",
+                    Kladr = "6200000100000",
                     BrandId = "C3B16998-C04D-484C-A17E-DB2C8FFE6DF3",
                     ModelId = "29DF0E37-1431-4037-AC0A-0FCA37AD0792"
                 },
@@ -105,7 +104,7 @@ namespace ELT.Tests.Controllers.InsuranceController
             Assert.Equal(String.Empty, res[TARGET_INSURANCE_COMPANY].Error);
             Assert.NotEqual(0, res[TARGET_INSURANCE_COMPANY].NumCalc);
 
-        }  
+        }
         [Fact]
         public void Test2()
         {