From 21cbdb6de6bb20fe8743efb7ac849fd830f8a124 Mon Sep 17 00:00:00 2001
From: Hanzei <16541325+hanzei@users.noreply.github.com>
Date: Fri, 23 Nov 2018 18:29:32 +0100
Subject: [PATCH] Add helper methods for SubmitDialog structs (#9864)

* Add To/From JSON methods for SubmitDialog structs

* Fix method ordering
---
 model/integration_action.go      | 38 +++++++++++++++++++++----
 model/integration_action_test.go | 49 ++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/model/integration_action.go b/model/integration_action.go
index 14c711b94c..7ea928c3f0 100644
--- a/model/integration_action.go
+++ b/model/integration_action.go
@@ -114,11 +114,6 @@ type SubmitDialogResponse struct {
 	Errors map[string]string `json:"errors,omitempty"`
 }
 
-func (r *PostActionIntegrationRequest) ToJson() []byte {
-	b, _ := json.Marshal(r)
-	return b
-}
-
 func GenerateTriggerId(userId string, s crypto.Signer) (string, string, *AppError) {
 	clientTriggerId := NewId()
 	triggerData := strings.Join([]string{clientTriggerId, userId, strconv.FormatInt(GetMillis(), 10)}, ":") + ":"
@@ -198,6 +193,11 @@ func (r *OpenDialogRequest) DecodeAndVerifyTriggerId(s *ecdsa.PrivateKey) (strin
 	return DecodeAndVerifyTriggerId(r.TriggerId, s)
 }
 
+func (r *PostActionIntegrationRequest) ToJson() []byte {
+	b, _ := json.Marshal(r)
+	return b
+}
+
 func PostActionIntegrationRequestFromJson(data io.Reader) *PostActionIntegrationRequest {
 	var o *PostActionIntegrationRequest
 	err := json.NewDecoder(data).Decode(&o)
@@ -221,6 +221,34 @@ func PostActionIntegrationResponseFromJson(data io.Reader) *PostActionIntegratio
 	return o
 }
 
+func SubmitDialogRequestFromJson(data io.Reader) *SubmitDialogRequest {
+	var o *SubmitDialogRequest
+	err := json.NewDecoder(data).Decode(&o)
+	if err != nil {
+		return nil
+	}
+	return o
+}
+
+func (r *SubmitDialogRequest) ToJson() []byte {
+	b, _ := json.Marshal(r)
+	return b
+}
+
+func SubmitDialogResponseFromJson(data io.Reader) *SubmitDialogResponse {
+	var o *SubmitDialogResponse
+	err := json.NewDecoder(data).Decode(&o)
+	if err != nil {
+		return nil
+	}
+	return o
+}
+
+func (r *SubmitDialogResponse) ToJson() []byte {
+	b, _ := json.Marshal(r)
+	return b
+}
+
 func (o *Post) StripActionIntegrations() {
 	attachments := o.Attachments()
 	if o.Props["attachments"] != nil {
diff --git a/model/integration_action_test.go b/model/integration_action_test.go
index d20b3fa0c2..80c582b2ef 100644
--- a/model/integration_action_test.go
+++ b/model/integration_action_test.go
@@ -109,3 +109,52 @@ func TestPostActionIntegrationResponseFromJsonError(t *testing.T) {
 	ro := PostActionIntegrationResponseFromJson(strings.NewReader(""))
 	assert.Nil(t, ro)
 }
+
+func TestSubmitDialogRequestToJson(t *testing.T) {
+	t.Run("all fine", func(t *testing.T) {
+		request := SubmitDialogRequest{
+			URL:        "http://example.org",
+			CallbackId: NewId(),
+			State:      "some state",
+			UserId:     NewId(),
+			ChannelId:  NewId(),
+			TeamId:     NewId(),
+			Submission: map[string]interface{}{
+				"text":  "some text",
+				"float": 1.2,
+				"bool":  true,
+			},
+			Cancelled: true,
+		}
+		jsonRequest := request.ToJson()
+		r := SubmitDialogRequestFromJson(bytes.NewReader(jsonRequest))
+
+		require.NotNil(t, r)
+		assert.Equal(t, request, *r)
+	})
+	t.Run("error", func(t *testing.T) {
+		r := SubmitDialogRequestFromJson(strings.NewReader(""))
+		assert.Nil(t, r)
+	})
+}
+
+func TestSubmitDialogResponseToJson(t *testing.T) {
+	t.Run("all fine", func(t *testing.T) {
+		request := SubmitDialogResponse{
+			Errors: map[string]string{
+				"text":  "some text",
+				"float": "1.2",
+				"bool":  "true",
+			},
+		}
+		jsonRequest := request.ToJson()
+		r := SubmitDialogResponseFromJson(bytes.NewReader(jsonRequest))
+
+		require.NotNil(t, r)
+		assert.Equal(t, request, *r)
+	})
+	t.Run("error", func(t *testing.T) {
+		r := SubmitDialogResponseFromJson(strings.NewReader(""))
+		assert.Nil(t, r)
+	})
+}