Fixes in models.

Author: o.nadymov

src/Directory.Build.props

@@ -35,9 +35,9 @@
         <PackageTags>TrueAPI; CRPT; ЧестныйЗнак; Маркировка</PackageTags>
         <Copyright>Copyright © $([System.DateTime]::Now.Year.ToString())</Copyright>
         <PackageReleaseNotes></PackageReleaseNotes>
-        <Version>1.0.0</Version>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <FileVersion>1.0.0.0</FileVersion>
+        <Version>1.0.1</Version>
+        <AssemblyVersion>1.0.1.0</AssemblyVersion>
+        <FileVersion>1.0.1.0</FileVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">

src/Spoleto.TrueApi/Enums/DocumentType.cs

@@ -399,6 +399,36 @@ public enum DocumentType
         /// <remarks>
         /// Формируется оператором фискальных данных
         /// </remarks>
-        RECEIPT_RETURN
+        RECEIPT_RETURN,
+
+        /// <summary>
+        /// УПД
+        /// </summary>
+        UNIVERSAL_TRANSFER_DOCUMENT,
+
+        /// <summary>
+        /// УПД(и)
+        /// </summary>
+        UNIVERSAL_TRANSFER_DOCUMENT_FIX,
+
+        /// <summary>
+        /// УПД (отгрузка продукции)
+        /// </summary>
+        FIXATION,
+
+        /// <summary>
+        /// Отмена отгрузки по УПД
+        /// </summary>
+        FIXATION_CANCEL,
+
+        /// <summary>
+        /// УКД
+        /// </summary>
+        UNIVERSAL_CORRECTION_DOCUMENT,
+
+        /// <summary>
+        /// УКД(и)
+        /// </summary>
+        UNIVERSAL_CORRECTION_DOCUMENT_FIX
     }
 }

src/Spoleto.TrueApi/Models/ErrorObject.cs

@@ -25,12 +25,12 @@ public record ErrorObject
         /// Содержит текстовое значение кода ошибки
         /// </summary>
         [JsonPropertyName("error")]
-        public ErrorEntry[] Error { get; set; }
+        public ErrorEntry Error { get; set; }
 
         /// <summary>
         /// Содержит внутри себя детали ошибки
         /// </summary>
         [JsonPropertyName("data")]
-        public ErrorData[] Data { get; set; }
+        public ErrorData Data { get; set; }
     }
 }

src/Spoleto.TrueApi/Models/Operation.cs

@@ -53,6 +53,6 @@ public record Operation
         /// Детали
         /// </summary>
         [JsonPropertyName("details")]
-        public OperationDetail[] Details { get; set; }
+        public OperationDetail Details { get; set; }
     }
 }

src/Spoleto.TrueApi/Providers/ITrueApiProvider.cs

@@ -36,7 +36,7 @@ string CreateDocument<T>(TrueApiProviderOption settings, DocumentInfoModel<T> do
         /// <param name="productGroup">Группа документа.</param>
         /// <param name="documentId">Идентификатор документа.</param>
         /// <returns>Информации о документе.</returns>
-        List<DocumentInfoReportModel<T>> GetDocumentById<T>(TrueApiProviderOption settings, ProductGroup productGroup, string documentId) where T : ITrueApiDocument
+        List<DocumentInfoReportModel<T>> GetDocumentById<T>(TrueApiProviderOption settings, ProductGroup? productGroup, string documentId) where T : ITrueApiDocument
             => GetDocumentByIdAsync<T>(settings, productGroup, documentId).GetAwaiter().GetResult();
 
         /// <summary>
@@ -47,7 +47,7 @@ List<DocumentInfoReportModel<T>> GetDocumentById<T>(TrueApiProviderOption settin
         /// <param name="productGroup">Группа документа.</param>
         /// <param name="documentId">Идентификатор документа.</param>
         /// <returns>Информации о документе.</returns>
-        Task<List<DocumentInfoReportModel<T>>> GetDocumentByIdAsync<T>(TrueApiProviderOption settings, ProductGroup productGroup, string documentId) where T : ITrueApiDocument;
+        Task<List<DocumentInfoReportModel<T>>> GetDocumentByIdAsync<T>(TrueApiProviderOption settings, ProductGroup? productGroup, string documentId) where T : ITrueApiDocument;
 
         /// <summary>
         /// Метод для получения идентификатора заказа на создание кодов маркировки (идентификации).

src/Spoleto.TrueApi/Providers/TrueApiProvider.cs

@@ -33,6 +33,8 @@ public TrueApiProvider(HttpClient httpClient, bool disposeHttpClient, ITrueApiTo
             _httpClient = httpClient;
             _disposeHttpClient = disposeHttpClient;
             _tokenProvider = tokenProvider;
+
+            _httpClient.ConfigureHttpClient();
         }
 
         #region IDisposable
@@ -87,7 +89,6 @@ private async Task<T> InvokeAsync<T>(TrueApiProviderOption settings, Uri uri, Ht
             bool isZipResponse = false)
         {
             var client = _httpClient;
-            client.ConfigureHttpClient();
 
             using var requestMessage = new HttpRequestMessage(method, uri);
             await InitHeaders(requestMessage, settings).ConfigureAwait(false);
@@ -187,9 +188,15 @@ public async Task<string> CreateDocumentAsync<T>(TrueApiProviderOption settings,
         /// <param name="productGroup">Группа документа.</param>
         /// <param name="documentId">Идентификатор документа.</param>
         /// <returns>Информации о документе.</returns>
-        public async Task<List<DocumentInfoReportModel<T>>> GetDocumentByIdAsync<T>(TrueApiProviderOption settings, ProductGroup productGroup, string documentId) where T : ITrueApiDocument
+        public async Task<List<DocumentInfoReportModel<T>>> GetDocumentByIdAsync<T>(TrueApiProviderOption settings, ProductGroup? productGroup, string documentId) where T : ITrueApiDocument
         {
-            var uri = new Uri(UriHelper.UrlCombine("https://markirovka.crpt.ru/api/v4/true-api", $"/doc/{documentId}/info?pg={productGroup}"));
+            var path = $"/doc/{documentId}/info";
+            if (productGroup != null)
+            {
+                path += "?pg={productGroup}";
+            }
+
+            var uri = new Uri(UriHelper.UrlCombine("https://markirovka.crpt.ru/api/v4/true-api", path)); //todo: hardcode
 
             return await InvokeAsync<List<DocumentInfoReportModel<T>>>(settings, uri, HttpMethod.Get).ConfigureAwait(false);
         }