From c54b8bb6296c41cd36cee790f8467497a9c3b4b0 Mon Sep 17 00:00:00 2001
From: Gao Sun <gao@silverhand.io>
Date: Mon, 5 Jun 2023 23:46:36 +0800
Subject: [PATCH] refactor(core): refine webhook log payload (#3973)

rename log payload field `json` -> `hookRequest.body`
---
 packages/core/src/libraries/hook/index.test.ts | 11 +++++++----
 packages/core/src/libraries/hook/index.ts      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/libraries/hook/index.test.ts b/packages/core/src/libraries/hook/index.test.ts
index 42a55b1eb..b6222bad5 100644
--- a/packages/core/src/libraries/hook/index.test.ts
+++ b/packages/core/src/libraries/hook/index.test.ts
@@ -100,10 +100,13 @@ describe('triggerInteractionHooks()', () => {
     expect(calledPayload).toHaveProperty('key', 'TriggerHook.' + HookEvent.PostSignIn);
     expect(calledPayload).toHaveProperty('payload.result', LogResult.Success);
     expect(calledPayload).toHaveProperty('payload.hookId', 'foo');
-    expect(calledPayload).toHaveProperty('payload.json.event', HookEvent.PostSignIn);
-    expect(calledPayload).toHaveProperty('payload.json.interactionEvent', InteractionEvent.SignIn);
-    expect(calledPayload).toHaveProperty('payload.json.hookId', 'foo');
-    expect(calledPayload).toHaveProperty('payload.json.userId', '123');
+    expect(calledPayload).toHaveProperty('payload.hookRequest.body.event', HookEvent.PostSignIn);
+    expect(calledPayload).toHaveProperty(
+      'payload.hookRequest.body.interactionEvent',
+      InteractionEvent.SignIn
+    );
+    expect(calledPayload).toHaveProperty('payload.hookRequest.body.hookId', 'foo');
+    expect(calledPayload).toHaveProperty('payload.hookRequest.body.userId', '123');
     expect(calledPayload).toHaveProperty('payload.response.statusCode', 200);
     expect(calledPayload).toHaveProperty('payload.response.body.message', 'ok');
     jest.useRealTimers();
diff --git a/packages/core/src/libraries/hook/index.ts b/packages/core/src/libraries/hook/index.ts
index c4148e551..812e2b053 100644
--- a/packages/core/src/libraries/hook/index.ts
+++ b/packages/core/src/libraries/hook/index.ts
@@ -95,7 +95,7 @@ export const createHookLibrary = (queries: Queries) => {
         const json: HookEventPayload = { hookId: id, ...payload };
         const logEntry = new LogEntry(`TriggerHook.${hookEvent}`);
 
-        logEntry.append({ json, hookId: id });
+        logEntry.append({ hookId: id, hookRequest: { body: json } });
 
         // Trigger web hook and log response
         await sendWebhookRequest({