SOAP: update KASKO Reference.cs

This reverts commit 3834aa87fe57c87795dff490cd762b4be81c6e8f.

ELT.Client/Connected Services/ELTKasko/ConnectedService.json

@@ -1,7 +1,9 @@
 {
+  "providerId": "Microsoft.Tools.ServiceModel.Svcutil",
+  "version": "2.1.0",
   "ExtendedData": {
     "inputs": [
-      "http://evolucia.elt-poisk.com/soap.php?wsdl"
+      "https://evolucia.elt-poisk.com/soap.php?wsdl"
     ],
     "collectionTypes": [
       "System.Array",
@@ -10,6 +12,7 @@
     "namespaceMappings": [
       "*, ELTKasko"
     ],
+    "outputFile": "Reference",
     "sync": true,
     "targetFramework": "netcoreapp3.1",
     "typeReuseMode": "All"

ELT.Client/Connected Services/ELTOsago/ConnectedService.json

@@ -3,7 +3,7 @@
   "Version": "15.0.40203.910",
   "ExtendedData": {
     "inputs": [
-      "http://evolucia.elt-poisk.com/soaposago.php?wsdl"
+      "https://evolucia.elt-poisk.com/soaposago.php?wsdl"
     ],
     "collectionTypes": [
       "System.Array",

ELT.Client/Connected Services/ELTOsago/Reference.cs

@@ -6792,6 +6792,7 @@ namespace ELTOsago
                 result.ReaderQuotas = System.Xml.XmlDictionaryReaderQuotas.Max;
                 result.MaxReceivedMessageSize = int.MaxValue;
                 result.AllowCookies = true;
+                result.Security.Mode = System.ServiceModel.BasicHttpSecurityMode.Transport;
                 return result;
             }
             throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
@@ -6801,7 +6802,7 @@ namespace ELTOsago
         {
             if ((endpointConfiguration == EndpointConfiguration.EltSoap))
             {
-                return new System.ServiceModel.EndpointAddress("http://evolucia.elt-poisk.com/soaposago.php");
+                return new System.ServiceModel.EndpointAddress("https://evolucia.elt-poisk.com/soaposago.php");
             }
             throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
         }

ELT.Client/Models/Common/Response.cs

@@ -0,0 +1,6 @@
+namespace ELT.Client.Models.Common;
+
+public class ErrorResponse
+{
+    public string Error { get; set; }
+}

ELT/Controllers/CommonController.cs

@@ -3,6 +3,7 @@ using ELT.Client.Models.Common;
 using ELTKasko;
 using ELTOsago;
 using Microsoft.AspNetCore.Mvc;
+using AuthInfo = ELTOsago.AuthInfo;
 using EltKaskoSoap = ELTKasko.EltSoap;
 using ELTOsagoSoap = ELTOsago.EltSoap;
 
@@ -37,74 +38,88 @@ public class CommonController : ControllerBase
     [HttpPost("get-kasko-calculation")]
     public ActionResult<KASKOCalculationResult> GetKaskoCalculation([FromBody] GetKaskoCalculationInput data)
     {
-        var preRequestData = this.GetPreRequestData(data.Preparams);
+        try
-
-        var request = data.Params;
-        request.UsageCityKLADR = preRequestData.Kladr;
-        request.Mark = preRequestData.Brand;
-        request.Model = preRequestData.Model;
-
-        if (request.Modification != null)
-            request.Modification.Name = preRequestData.Modification;
-
-        var specialMachinery = data.Preparams.SpecialMachinery;
-        specialMachinery.SpecialMachineryMark = preRequestData.Brand;
-        specialMachinery.SpecialMachineryModel = preRequestData.Model;
-        request.SpecialMachinery = specialMachinery;
-        
-        var res = _eltKaskoClient.PreliminaryKASKOCalculation(
-            new ELTKasko.AuthInfo
-            {
-                Login = _login,
-                Password = _password
-            }
-            , null
-            , data.CompanyId
-            , 0
-            , 0
-            , null
-            , null
-            , null
-            , "13"
-            , null
-            , false
-            , null
-            , null
-            , request);
-
-        if (res?.Error is { Length: > 0 })
         {
-            return BadRequest(res);
+            var preRequestData = this.GetPreRequestData(data.Preparams);
-        }
 
-        return Ok(res);
+            var request = data.Params;
+            request.UsageCityKLADR = preRequestData.Kladr;
+            request.Mark = preRequestData.Brand;
+            request.Model = preRequestData.Model;
+
+            if (request.Modification != null)
+                request.Modification.Name = preRequestData.Modification;
+
+            var specialMachinery = data.Preparams.SpecialMachinery;
+            specialMachinery.SpecialMachineryMark = preRequestData.Brand;
+            specialMachinery.SpecialMachineryModel = preRequestData.Model;
+            request.SpecialMachinery = specialMachinery;
+
+            var res = _eltKaskoClient.PreliminaryKASKOCalculation(
+                new ELTKasko.AuthInfo
+                {
+                    Login = _login,
+                    Password = _password
+                }
+                , null
+                , data.CompanyId
+                , 0
+                , 0
+                , null
+                , null
+                , null
+                , "13"
+                , null
+                , false
+                , null
+                , null
+                , request);
+
+            if (res?.Error is { Length: > 0 })
+            {
+                return BadRequest(res);
+            }
+
+            return Ok(res);
+        }
+        catch (Exception e)
+        {
+            return StatusCode(500, new ErrorResponse { Error = e.Message });
+        }
     }
 
     [HttpPost("get-osago-calculation")]
     public ActionResult<OSAGOFullCalculationResponse> GetOsagoCalculation([FromBody] GetOsagoCalculationInput data)
     {
-        var prerequestData = this.GetPreRequestData(data.Preparams);
+        try
-
-        var request = data.Params;
-        request.UsagePlace = prerequestData.Kladr;
-        request.CarInfo.Mark = prerequestData.Brand;
-        request.CarInfo.Model = prerequestData.Model;
-
-        request.AuthInfo = new ELTOsago.AuthInfo
         {
-            Login = _login,
+            var prerequestData = this.GetPreRequestData(data.Preparams);
-            Password = _password
-        };
 
-        request.InsuranceCompany ??= data.CompanyId;
+            var request = data.Params;
+            request.UsagePlace = prerequestData.Kladr;
+            request.CarInfo.Mark = prerequestData.Brand;
+            request.CarInfo.Model = prerequestData.Model;
 
-        var res = _eltOsagoClient.OSAGOFullCalculation(data.Params);
+            request.AuthInfo = new AuthInfo
+            {
+                Login = _login,
+                Password = _password
+            };
 
-        if (res?.Error is { Length: > 0 })
+            request.InsuranceCompany ??= data.CompanyId;
-        {
+
-            return BadRequest(res);
+            var res = _eltOsagoClient.OSAGOFullCalculation(data.Params);
+
+            if (res?.Error is { Length: > 0 })
+            {
+                return BadRequest(res);
+            }
+
+            return Ok(res);
+        }
+        catch (Exception e)
+        {
+            return StatusCode(500, new ErrorResponse { Error = e.Message });
         }
-
-        return Ok(res);
     }
 }

docker-compose.yml

@@ -0,0 +1,17 @@
+version: '3.3'
+services:
+  elt:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    environment:
+      - eltLogin=${ELT_LOGIN}
+      - eltPassword=${ELT_PASSWORD}
+    restart: always
+    networks:
+      - calc_network
+
+networks:
+  calc_network:
+    external:
+      name: calc_network