remove kladr sub request

This commit is contained in:
vchikalkin 2021-06-01 16:06:03 +03:00
parent 796e3417d5
commit 9e0f1186fc
4 changed files with 6 additions and 32 deletions

View File

@ -16,31 +16,8 @@ namespace ELT.Client.Managers.Insurance
public ELTPreData GetPreRequestData(Preparams preparams) public ELTPreData GetPreRequestData(Preparams preparams)
{ {
var eltPreData = new ELTPreData(); var eltPreData = new ELTPreData();
//KLADR
var kladr = "0"; eltPreData.Kladr = preparams.Kladr;
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;
//KLADR //KLADR
//CAR //CAR

View File

@ -2,8 +2,7 @@
{ {
public class Preparams public class Preparams
{ {
public string RegionName { get; set; } public string Kladr { get; set; }
public string CityName { get; set; }
public string BrandId { get; set; } public string BrandId { get; set; }
public string ModelId { get; set; } public string ModelId { get; set; }
} }

View File

@ -18,8 +18,7 @@ namespace ELT.Tests.Controllers.InsuranceController
CompanyIds = new[] { TARGET_INSURANCE_COMPANY }, CompanyIds = new[] { TARGET_INSURANCE_COMPANY },
Preparams = new Preparams Preparams = new Preparams
{ {
RegionName = "Рязанская обл", Kladr = "6200000100000",
CityName = "Рязань г",
BrandId = "C3B16998-C04D-484C-A17E-DB2C8FFE6DF3", BrandId = "C3B16998-C04D-484C-A17E-DB2C8FFE6DF3",
ModelId = "29DF0E37-1431-4037-AC0A-0FCA37AD0792" ModelId = "29DF0E37-1431-4037-AC0A-0FCA37AD0792"
}, },

View File

@ -18,8 +18,7 @@ namespace ELT.Tests.Controllers.InsuranceController
CompanyIds = new[] { TARGET_INSURANCE_COMPANY }, CompanyIds = new[] { TARGET_INSURANCE_COMPANY },
Preparams = new Preparams Preparams = new Preparams
{ {
RegionName = "Рязанская обл", Kladr = "6200000100000",
CityName = "Рязань г",
BrandId = "C3B16998-C04D-484C-A17E-DB2C8FFE6DF3", BrandId = "C3B16998-C04D-484C-A17E-DB2C8FFE6DF3",
ModelId = "29DF0E37-1431-4037-AC0A-0FCA37AD0792" 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.Equal(String.Empty, res[TARGET_INSURANCE_COMPANY].Error);
Assert.NotEqual(0, res[TARGET_INSURANCE_COMPANY].NumCalc); Assert.NotEqual(0, res[TARGET_INSURANCE_COMPANY].NumCalc);
} }
[Fact] [Fact]
public void Test2() public void Test2()
{ {