From a9a6eb9797ffe3d876583cdbd813cf003f16d55e Mon Sep 17 00:00:00 2001 From: RGleb Date: Mon, 5 Dec 2022 16:42:16 +0500 Subject: [PATCH 01/10] support for DocumentType.Condra --- EdiApi.Client/Types/Messages/DocumentType.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/EdiApi.Client/Types/Messages/DocumentType.cs b/EdiApi.Client/Types/Messages/DocumentType.cs index 7d4eaca..1a17fca 100644 --- a/EdiApi.Client/Types/Messages/DocumentType.cs +++ b/EdiApi.Client/Types/Messages/DocumentType.cs @@ -76,6 +76,9 @@ public enum DocumentType Iftmbf, /// Подтверждение заявки на транспортировку груза - Iftmbc + Iftmbc, + + /// Неструктурированное сообщение + Condra, } } \ No newline at end of file From 9b0d22eb5789b3617bc36c7f54b91bfacc8e0e47 Mon Sep 17 00:00:00 2001 From: RGleb Date: Mon, 5 Dec 2022 16:42:32 +0500 Subject: [PATCH 02/10] support for attachments in MessageData --- EdiApi.Client/Types/Common/MessageAttachment.cs | 12 ++++++++++++ EdiApi.Client/Types/Common/MessageData.cs | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 EdiApi.Client/Types/Common/MessageAttachment.cs diff --git a/EdiApi.Client/Types/Common/MessageAttachment.cs b/EdiApi.Client/Types/Common/MessageAttachment.cs new file mode 100644 index 0000000..b9dd043 --- /dev/null +++ b/EdiApi.Client/Types/Common/MessageAttachment.cs @@ -0,0 +1,12 @@ +namespace SkbKontur.EdiApi.Client.Types.Common +{ + /// Содержимое вложения + public class MessageAttachment + { + /// Имя вложенного файла + public string AttachmentFileName { get; set; } + + /// Тело вложенного файла + public byte[] AttachmentBody { get; set; } + } +} \ No newline at end of file diff --git a/EdiApi.Client/Types/Common/MessageData.cs b/EdiApi.Client/Types/Common/MessageData.cs index 64e5fca..c6cfd74 100644 --- a/EdiApi.Client/Types/Common/MessageData.cs +++ b/EdiApi.Client/Types/Common/MessageData.cs @@ -8,5 +8,8 @@ public class MessageData /// Тело сообщения public byte[] MessageBody { get; set; } + + /// Список вложенных файлов + public MessageAttachment[] MessageAttachments { get; set; } } } \ No newline at end of file From 8444d90c71c505c1206a3796afebef60f6909ce5 Mon Sep 17 00:00:00 2001 From: RGleb Date: Mon, 5 Dec 2022 17:00:22 +0500 Subject: [PATCH 03/10] support for SendMessageWithAttachments method --- .../Http/Messages/MessagesEdiApiHttpClient.cs | 11 +++++++++++ EdiApi.Client/IMessagesEdiApiClient.cs | 2 ++ 2 files changed, 13 insertions(+) diff --git a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs index c7226f5..87ae900 100644 --- a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs +++ b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs @@ -96,6 +96,17 @@ public OutboxMessageMeta SendMessage(string authToken, string boxId, MessageData return Serializer.Deserialize(result.Response.Content.ToString()); } + + public OutboxMessageMeta SendMessageWithAttachments(string authToken, string boxId, MessageData messageData) + { + var request = BuildPostRequest("V1/Messages/SendMessageWithAttachments", null, authToken, messageData) + .WithAdditionalQueryParameter("boxId", boxId); + + var result = clusterClient.Send(request); + EnsureSuccessResult(result); + + return Serializer.Deserialize(result.Response.Content.ToString()); + } public void MessageDeliveryStarted(string authToken, string boxId, string messageId) { diff --git a/EdiApi.Client/IMessagesEdiApiClient.cs b/EdiApi.Client/IMessagesEdiApiClient.cs index d8b5118..3d08326 100644 --- a/EdiApi.Client/IMessagesEdiApiClient.cs +++ b/EdiApi.Client/IMessagesEdiApiClient.cs @@ -20,6 +20,8 @@ public interface IMessagesEdiApiClient : IBaseEdiApiClient OutboxMessageMeta SendMessage(string authToken, string boxId, MessageData messageData); + OutboxMessageMeta SendMessageWithAttachments(string authToken, string boxId, MessageData messageData); + MessageBoxEventBatch GetEvents(string authToken, string boxId, string? exclusiveEventId, uint? count = null); MessageBoxEventBatch GetEvents(string authToken, string boxId, DateTime fromDateTime, uint? count = null); From 2bad5d7cda49f0d2eafaf7ede3b0e3db15c5ee73 Mon Sep 17 00:00:00 2001 From: RGleb Date: Mon, 5 Dec 2022 17:06:44 +0500 Subject: [PATCH 04/10] pre version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 2f4bc62..35b6da7 100644 --- 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.1-pre1", "assemblyVersion": { "precision": "build" }, From a41d4431582e175bafe37750332e4864a808d32e Mon Sep 17 00:00:00 2001 From: RGleb Date: Mon, 5 Dec 2022 17:30:35 +0500 Subject: [PATCH 05/10] cleanup --- EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs | 4 ++-- EdiApi.Client/Types/Common/MessageData.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs index 87ae900..de6e0c1 100644 --- a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs +++ b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs @@ -96,11 +96,11 @@ public OutboxMessageMeta SendMessage(string authToken, string boxId, MessageData return Serializer.Deserialize(result.Response.Content.ToString()); } - + public OutboxMessageMeta SendMessageWithAttachments(string authToken, string boxId, MessageData messageData) { var request = BuildPostRequest("V1/Messages/SendMessageWithAttachments", null, authToken, messageData) - .WithAdditionalQueryParameter("boxId", boxId); + .WithAdditionalQueryParameter("boxId", boxId); var result = clusterClient.Send(request); EnsureSuccessResult(result); diff --git a/EdiApi.Client/Types/Common/MessageData.cs b/EdiApi.Client/Types/Common/MessageData.cs index c6cfd74..d7861d9 100644 --- a/EdiApi.Client/Types/Common/MessageData.cs +++ b/EdiApi.Client/Types/Common/MessageData.cs @@ -8,7 +8,7 @@ public class MessageData /// Тело сообщения public byte[] MessageBody { get; set; } - + /// Список вложенных файлов public MessageAttachment[] MessageAttachments { get; set; } } From 20697fe695e6a268c792dfae90636c22252c3b3a Mon Sep 17 00:00:00 2001 From: RGleb Date: Wed, 25 Jan 2023 15:08:04 +0500 Subject: [PATCH 06/10] SendMessageWithAttachments -> SendMessageExtended --- EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs | 4 ++-- EdiApi.Client/IMessagesEdiApiClient.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs index de6e0c1..d9fa4ce 100644 --- a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs +++ b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs @@ -97,9 +97,9 @@ public OutboxMessageMeta SendMessage(string authToken, string boxId, MessageData return Serializer.Deserialize(result.Response.Content.ToString()); } - public OutboxMessageMeta SendMessageWithAttachments(string authToken, string boxId, MessageData messageData) + public OutboxMessageMeta SendMessageExtended(string authToken, string boxId, MessageData messageData) { - var request = BuildPostRequest("V1/Messages/SendMessageWithAttachments", null, authToken, messageData) + var request = BuildPostRequest("V1/Messages/SendMessageExtended", null, authToken, messageData) .WithAdditionalQueryParameter("boxId", boxId); var result = clusterClient.Send(request); diff --git a/EdiApi.Client/IMessagesEdiApiClient.cs b/EdiApi.Client/IMessagesEdiApiClient.cs index 3d08326..aa8b1b5 100644 --- a/EdiApi.Client/IMessagesEdiApiClient.cs +++ b/EdiApi.Client/IMessagesEdiApiClient.cs @@ -20,7 +20,7 @@ public interface IMessagesEdiApiClient : IBaseEdiApiClient OutboxMessageMeta SendMessage(string authToken, string boxId, MessageData messageData); - OutboxMessageMeta SendMessageWithAttachments(string authToken, string boxId, MessageData messageData); + OutboxMessageMeta SendMessageExtended(string authToken, string boxId, MessageData messageData); MessageBoxEventBatch GetEvents(string authToken, string boxId, string? exclusiveEventId, uint? count = null); From 47031072cd0d4599d8336ad9a1c33a0441f5beea Mon Sep 17 00:00:00 2001 From: RGleb Date: Wed, 25 Jan 2023 15:10:18 +0500 Subject: [PATCH 07/10] pre7 version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 35b6da7..b846784 100644 --- 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-pre1", + "version": "2.1-pre7", "assemblyVersion": { "precision": "build" }, From 96521ba8aee92fec60002af64c6f36681dd11ae6 Mon Sep 17 00:00:00 2001 From: RGleb Date: Wed, 8 Feb 2023 15:28:38 +0500 Subject: [PATCH 08/10] remove SendMessageExtended, change internal logic of SendMessage --- .../Http/Messages/MessagesEdiApiHttpClient.cs | 12 ------------ EdiApi.Client/IMessagesEdiApiClient.cs | 2 -- 2 files changed, 14 deletions(-) diff --git a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs index d9fa4ce..29a2160 100644 --- a/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs +++ b/EdiApi.Client/Http/Messages/MessagesEdiApiHttpClient.cs @@ -86,18 +86,6 @@ 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 result = clusterClient.Send(request); - EnsureSuccessResult(result); - - return Serializer.Deserialize(result.Response.Content.ToString()); - } - - public OutboxMessageMeta SendMessageExtended(string authToken, string boxId, MessageData messageData) { var request = BuildPostRequest("V1/Messages/SendMessageExtended", null, authToken, messageData) .WithAdditionalQueryParameter("boxId", boxId); diff --git a/EdiApi.Client/IMessagesEdiApiClient.cs b/EdiApi.Client/IMessagesEdiApiClient.cs index aa8b1b5..d8b5118 100644 --- a/EdiApi.Client/IMessagesEdiApiClient.cs +++ b/EdiApi.Client/IMessagesEdiApiClient.cs @@ -20,8 +20,6 @@ public interface IMessagesEdiApiClient : IBaseEdiApiClient OutboxMessageMeta SendMessage(string authToken, string boxId, MessageData messageData); - OutboxMessageMeta SendMessageExtended(string authToken, string boxId, MessageData messageData); - MessageBoxEventBatch GetEvents(string authToken, string boxId, string? exclusiveEventId, uint? count = null); MessageBoxEventBatch GetEvents(string authToken, string boxId, DateTime fromDateTime, uint? count = null); From 416efe5373e4b1bc72210fa9655ba1803124654e Mon Sep 17 00:00:00 2001 From: RGleb Date: Wed, 8 Feb 2023 15:36:10 +0500 Subject: [PATCH 09/10] 2.2-pre1 version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index b846784..334d2e6 100644 --- 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-pre7", + "version": "2.2-pre1", "assemblyVersion": { "precision": "build" }, From e5c7feb0c97f0114b193804432d8da1ba1d60fad Mon Sep 17 00:00:00 2001 From: RGleb Date: Wed, 29 Mar 2023 14:36:20 +0500 Subject: [PATCH 10/10] 2.2 version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 334d2e6..a4f40bb 100644 --- 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.2-pre1", + "version": "2.2", "assemblyVersion": { "precision": "build" },