Merge pull request #724 from nyaruka/single_channel_event_task

Queue all channel events to mailroom as a single task type

Author: rowanseymour

Diff for: backends/rapidpro/backend_test.go

@@ -1332,7 +1332,7 @@ func (ts *BackendTestSuite) TestMailroomEvents() {
 	ts.Equal(contact.ID_, dbE.ContactID_)
 	ts.Equal(contact.URNID_, dbE.ContactURNID_)
 
-	ts.assertQueuedContactTask(contact.ID_, "referral", map[string]any{
+	ts.assertQueuedContactTask(contact.ID_, "channel_event", map[string]any{
 		"event_id":    float64(dbE.ID_),
 		"event_type":  "referral",
 		"channel_id":  float64(10),

Diff for: backends/rapidpro/task.go

@@ -42,22 +42,7 @@ func queueChannelEvent(rc redis.Conn, c *Contact, e *ChannelEvent) error {
 		body["optin_id"] = e.OptInID_
 	}
 
-	switch e.EventType() {
-	case courier.EventTypeStopContact:
-		return queueMailroomTask(rc, "stop_contact", e.OrgID_, e.ContactID_, body)
-	case courier.EventTypeWelcomeMessage:
-		return queueMailroomTask(rc, "welcome_message", e.OrgID_, e.ContactID_, body)
-	case courier.EventTypeReferral:
-		return queueMailroomTask(rc, "referral", e.OrgID_, e.ContactID_, body)
-	case courier.EventTypeNewConversation:
-		return queueMailroomTask(rc, "new_conversation", e.OrgID_, e.ContactID_, body)
-	case courier.EventTypeOptIn:
-		return queueMailroomTask(rc, "optin", e.OrgID_, e.ContactID_, body)
-	case courier.EventTypeOptOut:
-		return queueMailroomTask(rc, "optout", e.OrgID_, e.ContactID_, body)
-	default:
-		return fmt.Errorf("unknown event type: %s", e.EventType())
-	}
+	return queueMailroomTask(rc, "channel_event", e.OrgID_, e.ContactID_, body)
 }
 
 func queueMsgDeleted(rc redis.Conn, ch *Channel, msgID courier.MsgID, contactID ContactID) error {
@@ -70,15 +55,13 @@ func queueMailroomTask(rc redis.Conn, taskType string, orgID OrgID, contactID Co
 	// create our event task
 	eventJSON := jsonx.MustMarshal(mrTask{
 		Type:     taskType,
-		OrgID:    orgID,
 		Task:     body,
 		QueuedOn: time.Now(),
 	})
 
 	// create our org task
 	contactJSON := jsonx.MustMarshal(mrTask{
 		Type:     "handle_contact_event",
-		OrgID:    orgID,
 		Task:     mrContactTask{ContactID: contactID},
 		QueuedOn: time.Now(),
 	})
@@ -103,7 +86,6 @@ type mrContactTask struct {
 
 type mrTask struct {
 	Type     string    `json:"type"`
-	OrgID    OrgID     `json:"org_id"`
 	Task     any       `json:"task"`
 	QueuedOn time.Time `json:"queued_on"`
 }