Merge branch 'CondraAndAttachments'

skbkontur · Mar 29, 2023 · d5b7d19 · d5b7d19
2 parents 39744d0 + e5c7feb
commit d5b7d19
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs
@@ -87,9 +87,8 @@ public OutboxMessageMeta GetOutboxMessageMeta(string authToken, string boxId, st
 
         public OutboxMessageMeta SendMessage(string authToken, string boxId, MessageData messageData)
         {
-            var request = BuildPostRequest("V1/Messages/SendMessage", null, authToken, messageData.MessageBody)
-                          .WithAdditionalQueryParameter("boxId", boxId)
-                          .WithAdditionalQueryParameter("messageFileName", messageData.MessageFileName);
+            var request = BuildPostRequest("V1/Messages/SendMessageExtended", null, authToken, messageData)
+                .WithAdditionalQueryParameter("boxId", boxId);
 
             var result = clusterClient.Send(request);
             EnsureSuccessResult(result);

diff --git a/EdiApi.Client/Types/Common/MessageAttachment.cs b/EdiApi.Client/Types/Common/MessageAttachment.cs
@@ -0,0 +1,12 @@
+namespace SkbKontur.EdiApi.Client.Types.Common
+{
+    /// <summary>Содержимое вложения</summary>
+    public class MessageAttachment
+    {
+        /// <summary>Имя вложенного файла</summary>
+        public string AttachmentFileName { get; set; }
+
+        /// <summary>Тело вложенного файла</summary>
+        public byte[] AttachmentBody { get; set; }
+    }
+}
diff --git a/EdiApi.Client/Types/Common/MessageData.cs b/EdiApi.Client/Types/Common/MessageData.cs
@@ -8,5 +8,8 @@ public class MessageData
 
         /// <summary>Тело сообщения</summary>
         public byte[] MessageBody { get; set; }
+
+        /// <summary>Список вложенных файлов</summary>
+        public MessageAttachment[] MessageAttachments { get; set; }
     }
 }
diff --git a/EdiApi.Client/Types/Messages/DocumentType.cs b/EdiApi.Client/Types/Messages/DocumentType.cs
@@ -76,6 +76,9 @@ public enum DocumentType
         Iftmbf,
 
         /// <summary>Подтверждение заявки на транспортировку груза</summary>
-        Iftmbc
+        Iftmbc,
+
+        /// <summary>Неструктурированное сообщение</summary>
+        Condra,
     }
 }
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.1",
+  "version": "2.2",
   "assemblyVersion": {
     "precision": "build"
   },