Переход на новую структуру ошибок при проверке МЧД

skbkontur · Jan 29, 2025 · 7e3638b · 7e3638b
1 parent d0e2c42
commit 7e3638b
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 8 deletions.
diff --git a/EdiApi.Client/EdiApi.Client.csproj b/EdiApi.Client/EdiApi.Client.csproj
@@ -14,10 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Vostok.ClusterClient.Core" Version="0.1.26" />
-    <PackageReference Include="Vostok.ClusterClient.Singular" Version="0.1.11" />
-    <PackageReference Include="Vostok.ClusterClient.Tracing" Version="0.1.4" />
-    <PackageReference Include="Vostok.ClusterClient.Transport" Version="0.1.17" />
+    <PackageReference Include="Vostok.ClusterClient.Core" Version="0.1.57" />
+    <PackageReference Include="Vostok.ClusterClient.Singular" Version="0.1.29" />
+    <PackageReference Include="Vostok.ClusterClient.Tracing" Version="0.1.8" />
+    <PackageReference Include="Vostok.ClusterClient.Transport" Version="0.1.39" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/EdiApi.Client/Http/BaseEdiApiHttpClient.cs b/EdiApi.Client/Http/BaseEdiApiHttpClient.cs
@@ -200,11 +200,11 @@ private string BuildAuthorizationHeader(AuthCredentials? authCredentials, string
             }
             if (!string.IsNullOrEmpty(authCredentials?.PortalSid))
             {
-                stringBuilder.Append("," + $"konturediauth_portalsid={authCredentials.PortalSid}");
+                stringBuilder.Append("," + $"konturediauth_portalsid={authCredentials!.PortalSid}");
             }
             if (!string.IsNullOrEmpty(authCredentials?.Login))
             {
-                stringBuilder.Append("," + $"konturediauth_login={authCredentials.Login},konturediauth_password={authCredentials.Password}");
+                stringBuilder.Append("," + $"konturediauth_login={authCredentials!.Login},konturediauth_password={authCredentials.Password}");
             }
 
             return stringBuilder.ToString();

diff --git a/EdiApi.Client/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationCheckStatus.cs b/EdiApi.Client/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationCheckStatus.cs
@@ -0,0 +1,18 @@
+namespace SkbKontur.EdiApi.Client.Types.Messages.BoxEventsContents
+{
+    /// <summary>Результат выполнения проверки МЧД</summary>
+    public enum DiadocPowerOfAttorneyValidationCheckStatus
+    {
+        /// <summary>Значение по умолчанию</summary>
+        UnknownCheckStatus = 0,
+
+        /// <summary>Проверка успешно пройдена</summary>
+        Ok = 1,
+
+        /// <summary>Есть предупреждение</summary>
+        Warning = 2,
+
+        /// <summary>Есть ошибка</summary>
+        Error = 3,
+    }
+}
diff --git a/EdiApi.Client/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationProtocol.cs b/EdiApi.Client/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationProtocol.cs
@@ -0,0 +1,9 @@
+namespace SkbKontur.EdiApi.Client.Types.Messages.BoxEventsContents
+{
+    /// <summary>Протокол валидации, содержащий результаты выполнения проверок МЧД</summary>
+    public class DiadocPowerOfAttorneyValidationProtocol
+    {
+        /// <summary>Результаты выполнения проверок МЧД</summary>
+        public DiadocPowerOfAttorneyValidationProtocolCheckResult[] CheckResults { get; set; }
+    }
+}
diff --git a/...nt/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationProtocolCheckResult.cs b/...nt/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationProtocolCheckResult.cs
@@ -0,0 +1,15 @@
+namespace SkbKontur.EdiApi.Client.Types.Messages.BoxEventsContents
+{
+    /// <summary>Результат проверки МЧД</summary>
+    public class DiadocPowerOfAttorneyValidationProtocolCheckResult
+    {
+        /// <summary>Результат выполнения проверки</summary>
+        public DiadocPowerOfAttorneyValidationCheckStatus Status { get; set; }
+
+        /// <summary>Текстовый идентификатор проверки</summary>
+        public string Name { get; set; }
+
+        /// <summary>Информация об ошибке или предупреждении</summary>
+        public DiadocPowerOfAttorneyValidationStatusError Error { get; set; }
+    }
+}
diff --git a/EdiApi.Client/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationStatus.cs b/EdiApi.Client/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationStatus.cs
@@ -14,5 +14,11 @@ public class DiadocPowerOfAttorneyValidationStatus
 
         /// <summary>Ошибки проверки МЧД</summary>
         public DiadocPowerOfAttorneyValidationStatusError[] ValidationErrors { get; set; }
+
+        /// <summary>Протокол валидации с результатами выполнения проверок. Возвращается в случае, когда StatusNamedId принимает значение: IsValid, IsNotValid, HasWarnings</summary>
+        public DiadocPowerOfAttorneyValidationProtocol ValidationProtocol { get; set; }
+
+        /// <summary>Описание ошибки, произошедшей в процессе выполнения операции. Возвращается в случае, если StatusNamedId принимает значение ValidationError или CanNotBeValidated</summary>
+        public DiadocPowerOfAttorneyValidationStatusError OperationError { get; set; }
     }
 }
diff --git a/...i.Client/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationStatusNamedId.cs b/...i.Client/Types/Messages/BoxEventsContents/DiadocPowerOfAttorneyValidationStatusNamedId.cs
@@ -17,5 +17,8 @@ public enum DiadocPowerOfAttorneyValidationStatusNamedId
 
         /// <summary>Ошибка во время проверки МЧД</summary>
         ValidationError = 4,
+
+        /// <summary>Часть проверок не может быть выполнена или была выполнена с предупреждениями</summary>
+        HasWarnings = 5,
     }
 }
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.6",
+  "version": "2.7",
   "assemblyVersion": {
     "precision": "build"
   },