From c92c9308867080ff0fa5c7a513f802c2879c7dec Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 13 Apr 2022 19:24:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(webhooks):=20=E6=9F=A5=E8=AF=A2=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E7=9A=84=E8=AF=B7=E6=B1=82=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/webhooks/model/sendAttemptsModel.ts   |  3 ++
 .../components/SendAttemptModal.vue           |  9 ++++
 .../WebhookSendRecordDto.cs                   |  7 +++
 .../WebhookEventRecordExtensions.cs           | 15 ++++++
 .../Extensions/WebhookSendRecordExtensions.cs | 52 +++++++++++++++++++
 .../WebhookSendRecordAppService.cs            |  6 ++-
 .../Localization/Resources/en.json            |  4 +-
 .../Localization/Resources/zh-Hans.json       |  4 +-
 8 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Extensions/WebhookEventRecordExtensions.cs
 create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Extensions/WebhookSendRecordExtensions.cs

diff --git a/apps/vue/src/api/webhooks/model/sendAttemptsModel.ts b/apps/vue/src/api/webhooks/model/sendAttemptsModel.ts
index a9d779d21..cb791380d 100644
--- a/apps/vue/src/api/webhooks/model/sendAttemptsModel.ts
+++ b/apps/vue/src/api/webhooks/model/sendAttemptsModel.ts
@@ -17,6 +17,9 @@ export interface WebhookSendAttempt {
   responseStatusCode?: HttpStatusCode;
   creationTime: Date;
   lastModificationTime?: Date;
+  sendExactSameData: boolean;
+  requestHeaders: Record<string, string>;
+  responseHeaders: Record<string, string>;
   webhookEvent: WebhookEvent;
 }
 
diff --git a/apps/vue/src/views/webhooks/send-attempts/components/SendAttemptModal.vue b/apps/vue/src/views/webhooks/send-attempts/components/SendAttemptModal.vue
index 1c6393a8c..e24e5428f 100644
--- a/apps/vue/src/views/webhooks/send-attempts/components/SendAttemptModal.vue
+++ b/apps/vue/src/views/webhooks/send-attempts/components/SendAttemptModal.vue
@@ -19,12 +19,21 @@
           <FormItem :label="L('DisplayName:TenantId')">
             <Input readonly :value="getTenant" />
           </FormItem>
+          <FormItem :label="L('DisplayName:SendExactSameData')">
+            <Checkbox disabled v-model:checked="modelRef.sendExactSameData">{{ L('DisplayName:SendExactSameData') }}</Checkbox>
+          </FormItem>
           <FormItem :label="L('DisplayName:CreationTime')">
             <Input readonly :value="getDateTime(modelRef.creationTime)" />
           </FormItem>
+          <FormItem :label="L('DisplayName:RequestHeaders')">
+            <CodeEditor readonly style="height: 300px;" :mode="MODE.JSON" v-model:value="modelRef.requestHeaders" />
+          </FormItem>
           <FormItem :label="L('DisplayName:ResponseStatusCode')">
             <Tag v-if="modelRef.responseStatusCode" :color="getHttpStatusColor(modelRef.responseStatusCode)">{{ httpStatusCodeMap[modelRef.responseStatusCode] }}</Tag>
           </FormItem>
+          <FormItem :label="L('DisplayName:ResponseHeaders')">
+            <CodeEditor readonly style="height: 300px;" :mode="MODE.JSON" v-model:value="modelRef.responseHeaders" />
+          </FormItem>
           <FormItem :label="L('DisplayName:Response')">
             <TextArea readonly v-model:value="modelRef.response" :auto-size="{ minRows: 10 }" />
           </FormItem>
diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordDto.cs b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordDto.cs
index 9c0dcd85e..d315b7353 100644
--- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordDto.cs
+++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordDto.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Net;
 using Volo.Abp.Application.Dtos;
 
@@ -20,5 +21,11 @@ public class WebhookSendRecordDto : EntityDto<Guid>
 
     public DateTime? LastModificationTime { get; set; }
 
+    public bool SendExactSameData { get; set; }
+
+    public IDictionary<string, string> RequestHeaders { get; set; } = new Dictionary<string, string>();
+
+    public IDictionary<string, string> ResponseHeaders { get; set; } = new Dictionary<string, string>();
+
     public WebhookEventRecordDto WebhookEvent { get; set; } = new WebhookEventRecordDto();
 }
diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Extensions/WebhookEventRecordExtensions.cs b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Extensions/WebhookEventRecordExtensions.cs
new file mode 100644
index 000000000..cf7138402
--- /dev/null
+++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Extensions/WebhookEventRecordExtensions.cs
@@ -0,0 +1,15 @@
+namespace LINGYUN.Abp.WebhooksManagement.Extensions;
+public static class WebhookEventRecordExtensions
+{
+    public static WebhookEventRecordDto ToWebhookEventRecordDto(this WebhookEventRecord eventRecord)
+    {
+        return new WebhookEventRecordDto
+        {
+            Id = eventRecord.Id,
+            CreationTime = eventRecord.CreationTime,
+            Data = eventRecord.Data,
+            TenantId = eventRecord.TenantId,
+            WebhookName = eventRecord.WebhookName
+        };
+    }
+}
diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Extensions/WebhookSendRecordExtensions.cs b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Extensions/WebhookSendRecordExtensions.cs
new file mode 100644
index 000000000..c3d0e2c26
--- /dev/null
+++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Extensions/WebhookSendRecordExtensions.cs
@@ -0,0 +1,52 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+namespace LINGYUN.Abp.WebhooksManagement.Extensions;
+public static class WebhookSendRecordExtensions 
+{
+    public static WebhookSendRecordDto ToWebhookSendRecordDto(this WebhookSendRecord sendRecord)
+    {
+        var dto = new WebhookSendRecordDto
+        {
+            Id = sendRecord.Id,
+            TenantId = sendRecord.TenantId,
+            CreationTime = sendRecord.CreationTime,
+            ResponseStatusCode = sendRecord.ResponseStatusCode,
+            SendExactSameData = sendRecord.SendExactSameData,
+            WebhookEventId = sendRecord.WebhookEventId,
+            WebhookSubscriptionId = sendRecord.WebhookSubscriptionId,
+            LastModificationTime = sendRecord.LastModificationTime,
+            RequestHeaders = sendRecord.GetRequestHeaders(),
+            ResponseHeaders = sendRecord.GetResponseHeaders(),
+            Response = sendRecord.Response,
+        };
+
+        if (sendRecord.WebhookEvent != null)
+        {
+            dto.WebhookEvent = sendRecord.WebhookEvent.ToWebhookEventRecordDto();
+        }
+
+        return dto;
+    }
+
+    public static IDictionary<string, string> GetRequestHeaders(this WebhookSendRecord sendRecord)
+    {
+        if (sendRecord.RequestHeaders.IsNullOrWhiteSpace())
+        {
+            return new Dictionary<string, string>();
+        }
+
+        return JsonConvert.DeserializeObject<Dictionary<string, string>>(sendRecord.RequestHeaders);
+    }
+
+    public static IDictionary<string, string> GetResponseHeaders(this WebhookSendRecord sendRecord)
+    {
+        if (sendRecord.ResponseHeaders.IsNullOrWhiteSpace())
+        {
+            return new Dictionary<string, string>();
+        }
+
+        return JsonConvert.DeserializeObject<Dictionary<string, string>>(sendRecord.ResponseHeaders);
+    }
+}
diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordAppService.cs b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordAppService.cs
index 53f4801ff..4ee69fd36 100644
--- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordAppService.cs
+++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordAppService.cs
@@ -1,9 +1,11 @@
 using LINGYUN.Abp.Webhooks;
 using LINGYUN.Abp.WebhooksManagement.Authorization;
+using LINGYUN.Abp.WebhooksManagement.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.BackgroundJobs;
@@ -30,7 +32,7 @@ public class WebhookSendRecordAppService : WebhooksManagementAppServiceBase, IWe
     {
         var sendRecord = await RecordRepository.GetAsync(id);
 
-        return ObjectMapper.Map<WebhookSendRecord, WebhookSendRecordDto>(sendRecord);
+        return sendRecord.ToWebhookSendRecordDto();
     }
 
     [Authorize(WebhooksManagementPermissions.WebhooksSendAttempts.Delete)]
@@ -58,7 +60,7 @@ public class WebhookSendRecordAppService : WebhooksManagementAppServiceBase, IWe
             input.Sorting, input.MaxResultCount, input.SkipCount);
 
         return new PagedResultDto<WebhookSendRecordDto>(totalCount,
-            ObjectMapper.Map<List<WebhookSendRecord>, List<WebhookSendRecordDto>>(sendRecords));
+            sendRecords.Select(sendRecord => sendRecord.ToWebhookSendRecordDto()).ToList());
     }
 
     [Authorize(WebhooksManagementPermissions.WebhooksSendAttempts.Resend)]
diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN/Abp/WebhooksManagement/Localization/Resources/en.json b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN/Abp/WebhooksManagement/Localization/Resources/en.json
index abae3a46e..5c03f4eea 100644
--- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN/Abp/WebhooksManagement/Localization/Resources/en.json
+++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN/Abp/WebhooksManagement/Localization/Resources/en.json
@@ -46,6 +46,8 @@
     "DisplayName:Secret": "Secret",
     "DisplayName:IsActive": "Is Active",
     "DisplayName:Webhooks": "Webhooks",
-    "DisplayName:Headers": "Headers"
+    "DisplayName:Headers": "Headers",
+    "DisplayName:RequestHeaders": "Request Headers",
+    "DisplayName:ResponseHeaders": "Response Headers"
   }
 }
\ No newline at end of file
diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN/Abp/WebhooksManagement/Localization/Resources/zh-Hans.json b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN/Abp/WebhooksManagement/Localization/Resources/zh-Hans.json
index 1ccd6a2ba..34efddf04 100644
--- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN/Abp/WebhooksManagement/Localization/Resources/zh-Hans.json
+++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN/Abp/WebhooksManagement/Localization/Resources/zh-Hans.json
@@ -46,6 +46,8 @@
     "DisplayName:Secret": "密钥",
     "DisplayName:IsActive": "是否启用",
     "DisplayName:Webhooks": "事件列表",
-    "DisplayName:Headers": "发送标头"
+    "DisplayName:Headers": "发送标头",
+    "DisplayName:RequestHeaders": "请求标头",
+    "DisplayName:ResponseHeaders": "响应标头"
   }
 }
\ No newline at end of file