Merge pull request #833 from nyaruka/new_ctask_names

Use new ctask names

Author: rowanseymour

Diff for: backends/rapidpro/backend_test.go

@@ -1213,7 +1213,7 @@ func (ts *BackendTestSuite) TestWriteMsg() {
 	err = writeMsgToDB(ctx, ts.b, msg, clog)
 	ts.NoError(err)
 
-	ts.assertQueuedContactTask(msg.ContactID_, "msg_event", map[string]any{
+	ts.assertQueuedContactTask(msg.ContactID_, "msg_received", map[string]any{
 		"channel_id":      float64(10),
 		"msg_id":          float64(msg.ID_),
 		"msg_uuid":        string(msg.UUID()),
@@ -1414,7 +1414,7 @@ func (ts *BackendTestSuite) TestMailroomEvents() {
 	ts.Equal(contact.ID_, dbE.ContactID_)
 	ts.Equal(contact.URNID_, dbE.ContactURNID_)
 
-	ts.assertQueuedContactTask(contact.ID_, "channel_event", map[string]any{
+	ts.assertQueuedContactTask(contact.ID_, "event_received", map[string]any{
 		"event_id":    float64(dbE.ID_),
 		"event_type":  "referral",
 		"channel_id":  float64(10),

Diff for: backends/rapidpro/channel_event.go

@@ -167,7 +167,7 @@ func writeChannelEventToDB(ctx context.Context, b *backend, e *ChannelEvent, clo
 	defer rc.Close()
 
 	// if we had a problem queueing the event, log it
-	err = queueChannelEvent(rc, contact, e)
+	err = queueEventHandling(rc, contact, e)
 	if err != nil {
 		slog.Error("error queueing channel event", "error", err, "evt_id", e.ID_)
 	}

Diff for: backends/rapidpro/task.go

@@ -24,10 +24,10 @@ func queueMsgHandling(rc redis.Conn, c *Contact, m *Msg) error {
 		"new_contact":     c.IsNew_,
 	}
 
-	return queueMailroomTask(rc, "msg_event", m.OrgID_, m.ContactID_, body)
+	return queueMailroomTask(rc, "msg_received", m.OrgID_, m.ContactID_, body)
 }
 
-func queueChannelEvent(rc redis.Conn, c *Contact, e *ChannelEvent) error {
+func queueEventHandling(rc redis.Conn, c *Contact, e *ChannelEvent) error {
 	body := map[string]any{
 		"event_id":    e.ID_,
 		"event_type":  e.EventType_,
@@ -42,7 +42,7 @@ func queueChannelEvent(rc redis.Conn, c *Contact, e *ChannelEvent) error {
 		body["optin_id"] = e.OptInID_
 	}
 
-	return queueMailroomTask(rc, "channel_event", e.OrgID_, e.ContactID_, body)
+	return queueMailroomTask(rc, "event_received", e.OrgID_, e.ContactID_, body)
 }
 
 func queueMsgDeleted(rc redis.Conn, ch *Channel, msgID courier.MsgID, contactID ContactID) error {