From 882756ef3a93fe88e7424b57e42fe75b5fd71a0c Mon Sep 17 00:00:00 2001
From: Lakhan Samani <lakhan.m.samani@gmail.com>
Date: Sun, 17 Jul 2022 17:05:35 +0530
Subject: [PATCH] fix: handle different response

---
 server/graph/generated/generated.go |  6 +++---
 server/graph/model/models_gen.go    |  4 ++--
 server/graph/schema.graphqls        |  2 +-
 server/graph/schema.resolvers.go    |  6 ++----
 server/resolvers/test_endpoint.go   | 10 +---------
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/server/graph/generated/generated.go b/server/graph/generated/generated.go
index fec93e1..6b159e4 100644
--- a/server/graph/generated/generated.go
+++ b/server/graph/generated/generated.go
@@ -1966,7 +1966,7 @@ type WebhookLog {
 
 type TestEndpointResponse {
 	http_status: Int64
-	response: Map
+	response: String
 }
 
 type WebhookLogs {
@@ -7292,9 +7292,9 @@ func (ec *executionContext) _TestEndpointResponse_response(ctx context.Context,
 	if resTmp == nil {
 		return graphql.Null
 	}
-	res := resTmp.(map[string]interface{})
+	res := resTmp.(*string)
 	fc.Result = res
-	return ec.marshalOMap2map(ctx, field.Selections, res)
+	return ec.marshalOString2ᚖstring(ctx, field.Selections, res)
 }
 
 func (ec *executionContext) _User_id(ctx context.Context, field graphql.CollectedField, obj *model.User) (ret graphql.Marshaler) {
diff --git a/server/graph/model/models_gen.go b/server/graph/model/models_gen.go
index 195f428..70762dc 100644
--- a/server/graph/model/models_gen.go
+++ b/server/graph/model/models_gen.go
@@ -228,8 +228,8 @@ type TestEndpointRequest struct {
 }
 
 type TestEndpointResponse struct {
-	HTTPStatus *int64                 `json:"http_status"`
-	Response   map[string]interface{} `json:"response"`
+	HTTPStatus *int64  `json:"http_status"`
+	Response   *string `json:"response"`
 }
 
 type UpdateAccessInput struct {
diff --git a/server/graph/schema.graphqls b/server/graph/schema.graphqls
index bd5845a..ca0e7df 100644
--- a/server/graph/schema.graphqls
+++ b/server/graph/schema.graphqls
@@ -177,7 +177,7 @@ type WebhookLog {
 
 type TestEndpointResponse {
 	http_status: Int64
-	response: Map
+	response: String
 }
 
 type WebhookLogs {
diff --git a/server/graph/schema.resolvers.go b/server/graph/schema.resolvers.go
index a0fea39..2cf0acf 100644
--- a/server/graph/schema.resolvers.go
+++ b/server/graph/schema.resolvers.go
@@ -173,7 +173,5 @@ func (r *Resolver) Mutation() generated.MutationResolver { return &mutationResol
 // Query returns generated.QueryResolver implementation.
 func (r *Resolver) Query() generated.QueryResolver { return &queryResolver{r} }
 
-type (
-	mutationResolver struct{ *Resolver }
-	queryResolver    struct{ *Resolver }
-)
+type mutationResolver struct{ *Resolver }
+type queryResolver struct{ *Resolver }
diff --git a/server/resolvers/test_endpoint.go b/server/resolvers/test_endpoint.go
index 3693165..fe1e55f 100644
--- a/server/resolvers/test_endpoint.go
+++ b/server/resolvers/test_endpoint.go
@@ -96,17 +96,9 @@ func TestEndpointResolver(ctx context.Context, params model.TestEndpointRequest)
 		return nil, err
 	}
 
-	response := map[string]interface{}{}
-	if string(body) != "" {
-		if err := json.Unmarshal(body, &response); err != nil {
-			log.Debug("error un-marshalling response: ", err)
-			return nil, err
-		}
-	}
-
 	statusCode := int64(resp.StatusCode)
 	return &model.TestEndpointResponse{
 		HTTPStatus: &statusCode,
-		Response:   response,
+		Response:   refs.NewStringRef(string(body)),
 	}, nil
 }