From f67b176dcfbad4ec6399096a7f1b73f52ae6c82a Mon Sep 17 00:00:00 2001 From: Karthikeyan Chinnakonda Date: Tue, 3 Mar 2020 21:51:41 +0530 Subject: [PATCH] fix the log JSON structure of scheduled trigger logs - the log contained `Right` while deriving to JSON from an Either --- server/src-lib/Hasura/Eventing/HTTP.hs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/server/src-lib/Hasura/Eventing/HTTP.hs b/server/src-lib/Hasura/Eventing/HTTP.hs index 794120d04135c..c242cc3b1a825 100644 --- a/server/src-lib/Hasura/Eventing/HTTP.hs +++ b/server/src-lib/Hasura/Eventing/HTTP.hs @@ -170,7 +170,17 @@ data HTTPRespExtra (a :: TriggerTypes) , _hreContext :: Maybe ExtraLogContext } -$(J.deriveToJSON (J.aesonDrop 4 J.snakeCase){J.omitNothingFields=True} ''HTTPRespExtra) +instance J.ToJSON (HTTPRespExtra 'Scheduled) where + toJSON (HTTPRespExtra resp ctxt) = do + case resp of + Left errResp -> J.object ["response" J..= J.toJSON errResp, "context" J..= J.toJSON ctxt] + Right rsp -> J.object ["response" J..= J.toJSON rsp, "context" J..= J.toJSON ctxt] + +instance J.ToJSON (HTTPRespExtra 'Event) where + toJSON (HTTPRespExtra resp ctxt) = do + case resp of + Left errResp -> J.object ["response" J..= J.toJSON errResp, "context" J..= J.toJSON ctxt] + Right rsp -> J.object ["response" J..= J.toJSON rsp, "context" J..= J.toJSON ctxt] instance ToEngineLog (HTTPRespExtra 'Event) Hasura where toEngineLog resp = (LevelInfo, eventTriggerLogType, J.toJSON resp)