Merge branch 'main' into fetch_attachments

Author: rowanseymour

CHANGELOG.md

@@ -1,3 +1,8 @@
+v7.5.17
+----------
+ * Update to latest goflow
+ * Add interrupt channel task
+
 v7.5.16
 ----------
  * If starting a message flow from an ivr trigger, send reject response

core/msgio/courier.go

@@ -130,7 +130,7 @@ func QueueCourierMessages(rc redis.Conn, contactID models.ContactID, msgs []*mod
 	return commitBatch()
 }
 
-var clearChannelQueueScript = redis.NewScript(3, `
+var queueClearScript = redis.NewScript(3, `
 -- KEYS: [QueueType, QueueName, TPS]
 local queueType, queueName, tps = KEYS[1], KEYS[2], tonumber(KEYS[3])
 
@@ -143,11 +143,11 @@ redis.call("DEL", queueKey .. "/0")
 
 -- reset queue to zero
 redis.call("ZADD", queueType .. ":active", 0, queueKey)
-
 `)
 
-func ClearChannelCourierQueue(rc redis.Conn, ch *models.Channel) error {
-	_, err := clearChannelQueueScript.Do(rc, "msgs", ch.UUID(), ch.TPS())
+// ClearCourierQueues clears the courier queues (priority and bulk) for the given channel
+func ClearCourierQueues(rc redis.Conn, ch *models.Channel) error {
+	_, err := queueClearScript.Do(rc, "msgs", ch.UUID(), ch.TPS())
 	return err
 }
 

core/msgio/courier_test.go

@@ -88,14 +88,14 @@ func TestClearChannelCourierQueue(t *testing.T) {
 	})
 
 	twilioChannel := oa.ChannelByID(testdata.TwilioChannel.ID)
-	msgio.ClearChannelCourierQueue(rc, twilioChannel)
+	msgio.ClearCourierQueues(rc, twilioChannel)
 
 	testsuite.AssertCourierQueues(t, map[string][]int{
 		"msgs:19012bfd-3ce3-4cae-9bb9-76cf92c73d49|10/0": {1}, // vonage, bulk priority
 	})
 
 	vonageChannel := oa.ChannelByID(testdata.VonageChannel.ID)
-	msgio.ClearChannelCourierQueue(rc, vonageChannel)
+	msgio.ClearCourierQueues(rc, vonageChannel)
 	testsuite.AssertCourierQueues(t, map[string][]int{})
 
 }

core/tasks/channels/interrupt_channel.go

@@ -42,7 +42,7 @@ func (t *InterruptChannelTask) Perform(ctx context.Context, rt *runtime.Runtime,
 		return errors.Wrapf(err, "error interrupting sessions")
 	}
 
-	err = msgio.ClearChannelCourierQueue(rc, channel)
+	err = msgio.ClearCourierQueues(rc, channel)
 	if err != nil {
 		return errors.Wrapf(err, "error clearing courier queues")
 	}