Merge pull request #1281 from nyaruka/ticket_mod_cleanup

Remove old body field on ticket modifier
nyaruka · Aug 8, 2024 · b207dbd · b207dbd
2 parents fd2006e + b2353db
commit b207dbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/flows/modifiers/testdata/ticket.json b/flows/modifiers/testdata/ticket.json
@@ -18,8 +18,7 @@
                 "email": "[email protected]",
                 "name": "Bob"
             },
-            "note": "this is a note",
-            "body": "this is a note"
+            "note": "this is a note"
         },
         "contact_after": {
             "uuid": "5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f",
@@ -85,8 +84,7 @@
                 "name": "Computers"
             },
             "assignee": null,
-            "note": "Should fail",
-            "body": "Should fail"
+            "note": "Should fail"
         },
         "contact_after": {
             "uuid": "5d76d86b-3bb9-4d5a-b822-c9d86f5d8e4f",

diff --git a/flows/modifiers/ticket.go b/flows/modifiers/ticket.go
@@ -63,8 +63,6 @@ type ticketModifierEnvelope struct {
 	Topic    *assets.TopicReference `json:"topic" validate:"required"`
 	Assignee *assets.UserReference  `json:"assignee"`
 	Note     string                 `json:"note"`
-
-	Body string `json:"body"` // deprecated
 }
 
 func readTicketModifier(assets flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Modifier, error) {
@@ -73,10 +71,6 @@ func readTicketModifier(assets flows.SessionAssets, data json.RawMessage, missin
 		return nil, err
 	}
 
-	if e.Note == "" && e.Body != "" {
-		e.Note = e.Body
-	}
-
 	topic := assets.Topics().Get(e.Topic.UUID)
 	if topic == nil {
 		missing(e.Topic, nil)
@@ -100,6 +94,5 @@ func (m *TicketModifier) MarshalJSON() ([]byte, error) {
 		Topic:         m.topic.Reference(),
 		Assignee:      m.assignee.Reference(),
 		Note:          m.note,
-		Body:          m.note,
 	})
 }