diff --git a/assets/references_test.go b/assets/references_test.go index e8b236172..ba048131d 100644 --- a/assets/references_test.go +++ b/assets/references_test.go @@ -127,7 +127,7 @@ func TestReferences(t *testing.T) { // ticketer references must always be concrete assert.EqualError(t, utils.Validate(assets.NewTicketerReference("", "Booking")), "field 'uuid' is required") - topicRef := assets.NewTopicReference("61602f3e-f603-4c70-8a8f-c477505bf4bf", "Weather") + topicRef := assets.NewTopicReference("61602f3e-f603-4c70-8a8f-c477505bf4bf", "Weather", "") assert.Equal(t, "topic", topicRef.Type()) assert.Equal(t, "61602f3e-f603-4c70-8a8f-c477505bf4bf", topicRef.Identity()) assert.Equal(t, uuids.UUID("61602f3e-f603-4c70-8a8f-c477505bf4bf"), topicRef.GenericUUID()) @@ -136,7 +136,7 @@ func TestReferences(t *testing.T) { assert.NoError(t, utils.Validate(topicRef)) // topic references must always be concrete - assert.EqualError(t, utils.Validate(assets.NewTopicReference("", "Weather")), "field 'uuid' is required") + assert.EqualError(t, utils.Validate(assets.NewTopicReference("", "Weather", "")), "field 'uuid' is required") userRef := assets.NewUserReference("bob@nyaruka.com", "Bob") assert.Equal(t, "user", userRef.Type()) diff --git a/assets/static/topic.go b/assets/static/topic.go index ee99e21f8..b003b97f2 100644 --- a/assets/static/topic.go +++ b/assets/static/topic.go @@ -6,15 +6,17 @@ import ( // Topic is a JSON serializable implementation of a topic asset type Topic struct { - UUID_ assets.TopicUUID `json:"uuid" validate:"required,uuid"` - Name_ string `json:"name"` + UUID_ assets.TopicUUID `json:"uuid" validate:"required,uuid"` + Name_ string `json:"name"` + QueueUUID_ assets.QueueUUID `json:"queue_uuid"` } // NewTopic creates a new topic -func NewTopic(uuid assets.TopicUUID, name string) assets.Topic { +func NewTopic(uuid assets.TopicUUID, name string, queueUUID assets.QueueUUID) assets.Topic { return &Topic{ - UUID_: uuid, - Name_: name, + UUID_: uuid, + Name_: name, + QueueUUID_: queueUUID, } } @@ -23,3 +25,6 @@ func (t *Topic) UUID() assets.TopicUUID { return t.UUID_ } // Name returns the name of this ticketer func (t *Topic) Name() string { return t.Name_ } + +// Queue returns the queue UUID of this ticketer->wenichats->queue UUID +func (t *Topic) QueueUUID() assets.QueueUUID { return t.QueueUUID_ } diff --git a/assets/static/topic_test.go b/assets/static/topic_test.go index 31915f63e..77297c7b9 100644 --- a/assets/static/topic_test.go +++ b/assets/static/topic_test.go @@ -13,7 +13,9 @@ func TestTopic(t *testing.T) { topic := static.NewTopic( assets.TopicUUID("37657cf7-5eab-4286-9cb0-bbf270587bad"), "Weather", + "1876c846-ea1f-43b4-8ffa-7330772845b6", ) assert.Equal(t, assets.TopicUUID("37657cf7-5eab-4286-9cb0-bbf270587bad"), topic.UUID()) assert.Equal(t, "Weather", topic.Name()) + assert.Equal(t, assets.QueueUUID("1876c846-ea1f-43b4-8ffa-7330772845b6"), topic.QueueUUID()) } diff --git a/assets/topic.go b/assets/topic.go index 04d5dd232..75d41066d 100644 --- a/assets/topic.go +++ b/assets/topic.go @@ -9,28 +9,34 @@ import ( // TopicUUID is the UUID of a topic type TopicUUID uuids.UUID +// QueueUUID is the UUID of a queue related to wenichats +type QueueUUID string + // Topic categorizes tickets // -// { -// "uuid": "cd48bd11-08b9-44e3-9778-8e26adf08a7a", -// "name": "Weather" -// } +// { +// "uuid": "cd48bd11-08b9-44e3-9778-8e26adf08a7a", +// "name": "Weather", +// "queue_uuid": "3108d8c2-2a93-4db8-b7c1-d4b1b9c812b3" +// } // // @asset topic type Topic interface { UUID() TopicUUID Name() string + QueueUUID() QueueUUID } // TopicReference is used to reference a topic type TopicReference struct { - UUID TopicUUID `json:"uuid" validate:"required,uuid"` - Name string `json:"name"` + UUID TopicUUID `json:"uuid" validate:"required,uuid"` + Name string `json:"name"` + QueueUUID QueueUUID `json:"queue_uuid"` } // NewTopicReference creates a new topic reference with the given UUID and name -func NewTopicReference(uuid TopicUUID, name string) *TopicReference { - return &TopicReference{UUID: uuid, Name: name} +func NewTopicReference(uuid TopicUUID, name string, queueUUID QueueUUID) *TopicReference { + return &TopicReference{UUID: uuid, Name: name, QueueUUID: queueUUID} } // Type returns the name of the asset type diff --git a/flows/actions/base_test.go b/flows/actions/base_test.go index b29e50dbc..b2cba57cd 100644 --- a/flows/actions/base_test.go +++ b/flows/actions/base_test.go @@ -468,7 +468,7 @@ func TestConstructors(t *testing.T) { actions.NewOpenTicket( actionUUID, assets.NewTicketerReference(assets.TicketerUUID("0baee364-07a7-4c93-9778-9f55a35903bb"), "Support Tickets"), - assets.NewTopicReference("472a7a73-96cb-4736-b567-056d987cc5b4", "Weather"), + assets.NewTopicReference("472a7a73-96cb-4736-b567-056d987cc5b4", "Weather", ""), "Where are my cookies?", assets.NewUserReference("bob@nyaruka.com", "Bob McTickets"), "Ticket", @@ -482,6 +482,7 @@ func TestConstructors(t *testing.T) { }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Where are my cookies?", diff --git a/flows/actions/open_ticket.go b/flows/actions/open_ticket.go index 9a8792d12..2e09ebb86 100644 --- a/flows/actions/open_ticket.go +++ b/flows/actions/open_ticket.go @@ -27,7 +27,8 @@ const TypeOpenTicket string = "open_ticket" // }, // "topic": { // "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", -// "name": "Weather" +// "name": "Weather", +// "queue_uuid": "" // }, // "body": "@input", // "assignee": {"email": "bob@nyaruka.com", "name": "Bob McTickets"}, diff --git a/flows/actions/testdata/_assets.json b/flows/actions/testdata/_assets.json index 4bfb4ef8b..cde34c281 100644 --- a/flows/actions/testdata/_assets.json +++ b/flows/actions/testdata/_assets.json @@ -289,14 +289,17 @@ "topics": [ { "uuid": "0d9a2c56-6fc2-4f27-93c5-a6322e26b740", + "queue_uuid": "", "name": "General" }, { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, { "uuid": "daa356b6-32af-44f0-9d35-6126d55ec3e9", + "queue_uuid": "", "name": "Computers" } ], diff --git a/flows/actions/testdata/open_ticket.json b/flows/actions/testdata/open_ticket.json index 199ab5552..bc9d257d6 100644 --- a/flows/actions/testdata/open_ticket.json +++ b/flows/actions/testdata/open_ticket.json @@ -70,6 +70,7 @@ }, "topic": { "uuid": "dc61e948-26a1-407e-9739-b73b46400b51", + "queue_uuid": "", "name": "Deleted" }, "body": "Where are my cookies?", @@ -105,6 +106,7 @@ { "uuid": "dc61e948-26a1-407e-9739-b73b46400b51", "name": "Deleted", + "queue_uuid": "", "type": "topic", "missing": true } @@ -118,6 +120,7 @@ "dependency": { "uuid": "dc61e948-26a1-407e-9739-b73b46400b51", "name": "Deleted", + "queue_uuid": "", "type": "topic" } } @@ -173,6 +176,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: @input.text", @@ -217,6 +221,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: Hi everybody", @@ -287,6 +292,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: Hi everybody", @@ -311,6 +317,7 @@ { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", "name": "Weather", + "queue_uuid": "", "type": "topic" }, { @@ -374,6 +381,7 @@ }, "topic": { "uuid": "0d9a2c56-6fc2-4f27-93c5-a6322e26b740", + "queue_uuid": "", "name": "General" }, "body": "Last message: Hi everybody", @@ -440,6 +448,7 @@ }, "topic": { "uuid": "0d9a2c56-6fc2-4f27-93c5-a6322e26b740", + "queue_uuid": "", "name": "General" }, "body": "Last message: Hi everybody", @@ -475,6 +484,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: @input.text", @@ -518,6 +528,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: Hi everybody", @@ -588,6 +599,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: Hi everybody", @@ -613,6 +625,7 @@ { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", "name": "Weather", + "queue_uuid": "", "type": "topic" } ], @@ -633,6 +646,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: @input.text", @@ -682,6 +696,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: Hi everybody", @@ -748,6 +763,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: Hi everybody", @@ -769,6 +785,7 @@ { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", "name": "Weather", + "queue_uuid": "", "type": "topic" } ], @@ -833,6 +850,7 @@ }, "topic": { "uuid": "0d9a2c56-6fc2-4f27-93c5-a6322e26b740", + "queue_uuid": "", "name": "General" }, "body": "Where are my cookies? ", @@ -925,6 +943,7 @@ }, "topic": { "uuid": "0d9a2c56-6fc2-4f27-93c5-a6322e26b740", + "queue_uuid": "", "name": "General" }, "body": "Last message: Hi everybody", diff --git a/flows/contact_test.go b/flows/contact_test.go index 680df8738..61a27267f 100644 --- a/flows/contact_test.go +++ b/flows/contact_test.go @@ -46,6 +46,7 @@ func TestContact(t *testing.T) { "topics": [ { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" } ] diff --git a/flows/engine/testdata/templates.json b/flows/engine/testdata/templates.json index 810a74e62..3349dfbfe 100644 --- a/flows/engine/testdata/templates.json +++ b/flows/engine/testdata/templates.json @@ -389,7 +389,7 @@ }, { "template": "@(json(contact.tickets))", - "output": "[{\"assignee\":null,\"body\":\"I have a problem\",\"topic\":null,\"uuid\":\"e5f5a9b0-1c08-4e56-8f5c-92e00bc3cf52\"},{\"assignee\":{\"email\":\"bob@nyaruka.com\",\"first_name\":\"Bob\",\"name\":\"Bob\"},\"body\":\"What day is it?\",\"topic\":{\"name\":\"Weather\",\"uuid\":\"472a7a73-96cb-4736-b567-056d987cc5b4\"},\"uuid\":\"78d1fe0d-7e39-461e-81c3-a6a25f15ed69\"}]" + "output": "[{\"assignee\":null,\"body\":\"I have a problem\",\"topic\":null,\"uuid\":\"e5f5a9b0-1c08-4e56-8f5c-92e00bc3cf52\"},{\"assignee\":{\"email\":\"bob@nyaruka.com\",\"first_name\":\"Bob\",\"name\":\"Bob\"},\"body\":\"What day is it?\",\"topic\":{\"name\":\"Weather\",\"queue_uuid\":\"\",\"uuid\":\"472a7a73-96cb-4736-b567-056d987cc5b4\"},\"uuid\":\"78d1fe0d-7e39-461e-81c3-a6a25f15ed69\"}]" }, { "template": "@ticket", @@ -397,7 +397,7 @@ }, { "template": "@(json(ticket))", - "output": "{\"assignee\":{\"email\":\"bob@nyaruka.com\",\"first_name\":\"Bob\",\"name\":\"Bob\"},\"body\":\"What day is it?\",\"topic\":{\"name\":\"Weather\",\"uuid\":\"472a7a73-96cb-4736-b567-056d987cc5b4\"},\"uuid\":\"78d1fe0d-7e39-461e-81c3-a6a25f15ed69\"}" + "output": "{\"assignee\":{\"email\":\"bob@nyaruka.com\",\"first_name\":\"Bob\",\"name\":\"Bob\"},\"body\":\"What day is it?\",\"topic\":{\"name\":\"Weather\",\"queue_uuid\":\"\",\"uuid\":\"472a7a73-96cb-4736-b567-056d987cc5b4\"},\"uuid\":\"78d1fe0d-7e39-461e-81c3-a6a25f15ed69\"}" }, { "template": "@(json(contact))", @@ -447,6 +447,7 @@ "body": "What day is it?", "topic": { "name": "Weather", + "queue_uuid": "", "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4" }, "uuid": "78d1fe0d-7e39-461e-81c3-a6a25f15ed69" @@ -533,6 +534,7 @@ "body": "What day is it?", "topic": { "name": "Weather", + "queue_uuid": "", "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4" }, "uuid": "78d1fe0d-7e39-461e-81c3-a6a25f15ed69" @@ -758,6 +760,7 @@ "body": "What day is it?", "topic": { "name": "Weather", + "queue_uuid": "", "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4" }, "uuid": "78d1fe0d-7e39-461e-81c3-a6a25f15ed69" diff --git a/flows/events/base_test.go b/flows/events/base_test.go index 33b0bac12..99ec53a6a 100644 --- a/flows/events/base_test.go +++ b/flows/events/base_test.go @@ -316,6 +316,7 @@ func TestEventMarshaling(t *testing.T) { }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "uuid": "78d1fe0d-7e39-461e-81c3-a6a25f15ed69" @@ -542,6 +543,7 @@ func TestEventMarshaling(t *testing.T) { }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Where are my cookies?", diff --git a/flows/events/ticket_opened.go b/flows/events/ticket_opened.go index caf01b302..70ecc109e 100644 --- a/flows/events/ticket_opened.go +++ b/flows/events/ticket_opened.go @@ -34,6 +34,7 @@ type Ticket struct { // }, // "topic": { // "uuid": "add17edf-0b6e-4311-bcd7-a64b2a459157", +// "queue_uuid": "", // "name": "Weather" // }, // "body": "Where are my cookies?", diff --git a/flows/inspect/dependencies_test.go b/flows/inspect/dependencies_test.go index cb624681f..9cd8d1115 100644 --- a/flows/inspect/dependencies_test.go +++ b/flows/inspect/dependencies_test.go @@ -46,7 +46,7 @@ func TestDependencies(t *testing.T) { flows.NewExtractedReference(node1, action1, nil, envs.NilLanguage, assets.NewLabelReference("31c06b7c-010d-4f91-9590-d3fbdc2fb7ac", "Spam")), flows.NewExtractedReference(node1, action1, nil, envs.NilLanguage, assets.NewTemplateReference("ff958d30-f50e-48ab-a524-37ed1e9620d9", "Welcome")), flows.NewExtractedReference(node1, action1, nil, envs.NilLanguage, assets.NewTicketerReference("fb9cab80-4450-4a9d-ba9b-cb8df40dd233", "Support")), - flows.NewExtractedReference(node1, action1, nil, envs.NilLanguage, assets.NewTopicReference("531d3fc7-64f4-4170-927d-b477e8145dd3", "Weather")), + flows.NewExtractedReference(node1, action1, nil, envs.NilLanguage, assets.NewTopicReference("531d3fc7-64f4-4170-927d-b477e8145dd3", "Weather", "")), flows.NewExtractedReference(node1, action1, nil, envs.NilLanguage, assets.NewUserReference("jim@nyaruka.com", "Jim")), flows.NewExtractedReference(node2, nil, router2, envs.NilLanguage, assets.NewGlobalReference("org_name", "Org Name")), } @@ -136,6 +136,7 @@ func TestDependencies(t *testing.T) { "missing": true, "name": "Weather", "type": "topic", + "queue_uuid": "", "uuid": "531d3fc7-64f4-4170-927d-b477e8145dd3" }, { diff --git a/flows/tickets_test.go b/flows/tickets_test.go index 7365e27dc..63e9e7d56 100644 --- a/flows/tickets_test.go +++ b/flows/tickets_test.go @@ -36,6 +36,7 @@ func TestTickets(t *testing.T) { "topics": [ { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, { @@ -64,7 +65,7 @@ func TestTickets(t *testing.T) { weather := sa.Topics().Get("472a7a73-96cb-4736-b567-056d987cc5b4") assert.Equal(t, assets.TopicUUID("472a7a73-96cb-4736-b567-056d987cc5b4"), weather.UUID()) assert.Equal(t, "Weather", weather.Name()) - assert.Equal(t, assets.NewTopicReference("472a7a73-96cb-4736-b567-056d987cc5b4", "Weather"), weather.Reference()) + assert.Equal(t, assets.NewTopicReference("472a7a73-96cb-4736-b567-056d987cc5b4", "Weather", ""), weather.Reference()) assert.Equal(t, weather, sa.Topics().FindByName("Weather")) assert.Equal(t, weather, sa.Topics().FindByName("WEATHER")) @@ -112,7 +113,7 @@ func TestTickets(t *testing.T) { ticket2, err := flows.ReadTicket(sa, []byte(`{ "uuid": "5a4af021-d2c2-47fc-9abc-abbb8635d8c0", "ticketer": {"uuid": "d605bb96-258d-4097-ad0a-080937db2212", "name": "Support Tickets"}, - "topic": {"uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", "name": "Weather"}, + "topic": {"uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", "queue_uuid":"" ,"name": "Weather"}, "subject": "Old Ticket", "body": "Where are my shoes?", "assignee": {"email": "bob@nyaruka.com", "name": "Bob"} diff --git a/flows/topic.go b/flows/topic.go index a36d2ad86..a6c903bf0 100644 --- a/flows/topic.go +++ b/flows/topic.go @@ -26,14 +26,15 @@ func (t *Topic) Reference() *assets.TopicReference { if t == nil { return nil } - return assets.NewTopicReference(t.UUID(), t.Name()) + return assets.NewTopicReference(t.UUID(), t.Name(), t.QueueUUID()) } // Context returns the properties available in expressions // -// __default__:text -> the name -// uuid:text -> the UUID of the topic -// name:text -> the name of the topic +// __default__:text -> the name +// uuid:text -> the UUID of the topic +// name:text -> the name of the topic +// queue_uuid:text -> the UUID of the topic queue related to wenichats integrations // // @context topic func (t *Topic) Context(env envs.Environment) map[string]types.XValue { @@ -42,6 +43,7 @@ func (t *Topic) Context(env envs.Environment) map[string]types.XValue { "__default__": types.NewXText(t.Name()), "uuid": types.NewXText(string(t.UUID())), "name": types.NewXText(t.Name()), + "queue_uuid": types.NewXText(string(t.QueueUUID())), } } diff --git a/flows/triggers/testdata/_assets.json b/flows/triggers/testdata/_assets.json index 9e5d58fc0..fb302fd4f 100644 --- a/flows/triggers/testdata/_assets.json +++ b/flows/triggers/testdata/_assets.json @@ -29,6 +29,7 @@ "topics": [ { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queeue_uuid": "", "name": "Weather" } ], diff --git a/flows/triggers/testdata/ticket.json b/flows/triggers/testdata/ticket.json index 2e20f5e3b..83ad2e09b 100644 --- a/flows/triggers/testdata/ticket.json +++ b/flows/triggers/testdata/ticket.json @@ -42,6 +42,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Where are my shoes?", @@ -59,6 +60,7 @@ "body": "Where are my shoes?", "topic": { "name": "Weather", + "queue_uuid": "", "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4" }, "uuid": "0d43506d-b92f-4468-8bee-0f31dd438abf" diff --git a/flows/triggers/ticket.go b/flows/triggers/ticket.go index 39e84fa2e..9b585f5b5 100644 --- a/flows/triggers/ticket.go +++ b/flows/triggers/ticket.go @@ -48,7 +48,7 @@ type TicketEvent struct { // "ticket": { // "uuid": "58e9b092-fe42-4173-876c-ff45a14a24fe", // "ticketer": {"uuid": "19dc6346-9623-4fe4-be80-538d493ecdf5", "name": "Support Tickets"}, -// "topic": {"uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", "name": "Weather"}, +// "topic": {"uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", "name": "Weather", "queue_uuid": ""}, // "body": "Where are my shoes?" // } // }, diff --git a/test/session.go b/test/session.go index 84a1bba55..21dd3ccda 100644 --- a/test/session.go +++ b/test/session.go @@ -64,6 +64,7 @@ var sessionAssets = `{ "topics": [ { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, { @@ -343,6 +344,7 @@ var sessionTrigger = `{ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "assignee": {"email": "bob@nyaruka.com", "name": "Bob"} diff --git a/test/testdata/runner/ticketing.json b/test/testdata/runner/ticketing.json index 3c156069d..1c955db25 100644 --- a/test/testdata/runner/ticketing.json +++ b/test/testdata/runner/ticketing.json @@ -62,6 +62,7 @@ }, "topic": { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" }, "body": "Last message: @input.text", @@ -137,6 +138,7 @@ "topics": [ { "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4", + "queue_uuid": "", "name": "Weather" } ] diff --git a/test/testdata/runner/ticketing.test.json b/test/testdata/runner/ticketing.test.json index 85097d6f1..fff028378 100644 --- a/test/testdata/runner/ticketing.test.json +++ b/test/testdata/runner/ticketing.test.json @@ -215,6 +215,7 @@ }, "topic": { "name": "Weather", + "queue_uuid": "", "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4" }, "uuid": "5ecda5fc-951c-437b-a17e-f85e49829fb9" @@ -230,7 +231,7 @@ "value": "5ecda5fc-951c-437b-a17e-f85e49829fb9" }, { - "body": "[{\"assignee\":null,\"body\":\"I have a problem\",\"topic\":null,\"uuid\":\"e5f5a9b0-1c08-4e56-8f5c-92e00bc3cf52\"},{\"assignee\":null,\"body\":\"Last message: Rats\",\"topic\":{\"name\":\"Weather\",\"uuid\":\"472a7a73-96cb-4736-b567-056d987cc5b4\"},\"uuid\":\"5ecda5fc-951c-437b-a17e-f85e49829fb9\"}]", + "body": "[{\"assignee\":null,\"body\":\"I have a problem\",\"topic\":null,\"uuid\":\"e5f5a9b0-1c08-4e56-8f5c-92e00bc3cf52\"},{\"assignee\":null,\"body\":\"Last message: Rats\",\"topic\":{\"name\":\"Weather\",\"queue_uuid\":\"\",\"uuid\":\"472a7a73-96cb-4736-b567-056d987cc5b4\"},\"uuid\":\"5ecda5fc-951c-437b-a17e-f85e49829fb9\"}]", "created_on": "2018-07-06T12:30:32.123456789Z", "step_uuid": "312d3af0-a565-4c96-ba00-bd7f0d08e671", "subject": "New ticket: 5ecda5fc-951c-437b-a17e-f85e49829fb9", @@ -285,6 +286,7 @@ }, "topic": { "name": "Weather", + "queue_uuid": "", "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4" }, "uuid": "5ecda5fc-951c-437b-a17e-f85e49829fb9" @@ -388,6 +390,7 @@ }, "topic": { "name": "Weather", + "queue_uuid": "", "uuid": "472a7a73-96cb-4736-b567-056d987cc5b4" }, "uuid": "5ecda5fc-951c-437b-a17e-f85e49829fb9" @@ -403,7 +406,7 @@ "value": "5ecda5fc-951c-437b-a17e-f85e49829fb9" }, { - "body": "[{\"assignee\":null,\"body\":\"I have a problem\",\"topic\":null,\"uuid\":\"e5f5a9b0-1c08-4e56-8f5c-92e00bc3cf52\"},{\"assignee\":null,\"body\":\"Last message: Rats\",\"topic\":{\"name\":\"Weather\",\"uuid\":\"472a7a73-96cb-4736-b567-056d987cc5b4\"},\"uuid\":\"5ecda5fc-951c-437b-a17e-f85e49829fb9\"}]", + "body": "[{\"assignee\":null,\"body\":\"I have a problem\",\"topic\":null,\"uuid\":\"e5f5a9b0-1c08-4e56-8f5c-92e00bc3cf52\"},{\"assignee\":null,\"body\":\"Last message: Rats\",\"topic\":{\"name\":\"Weather\",\"queue_uuid\":\"\",\"uuid\":\"472a7a73-96cb-4736-b567-056d987cc5b4\"},\"uuid\":\"5ecda5fc-951c-437b-a17e-f85e49829fb9\"}]", "created_on": "2018-07-06T12:30:32.123456789Z", "step_uuid": "312d3af0-a565-4c96-ba00-bd7f0d08e671", "subject": "New ticket: 5ecda5fc-951c-437b-a17e-f85e49829fb9",