Set FlowStart.UUID in only place we need to

Ilhasoft · Feb 7, 2023 · 826b627 · 826b627
1 parent ef6edb7
commit 826b627
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/core/models/starts.go b/core/models/starts.go
@@ -233,13 +233,6 @@ type startGroup struct {
 
 // InsertFlowStarts inserts all the passed in starts
 func InsertFlowStarts(ctx context.Context, db Queryer, starts []*FlowStart) error {
-	// TODO figure out if this is needed
-	for _, s := range starts {
-		if s.UUID == "" {
-			s.UUID = uuids.New()
-		}
-	}
-
 	// insert our starts
 	err := BulkQuery(ctx, "inserting flow start", db, sqlInsertStart, starts)
 	if err != nil {

diff --git a/core/tasks/campaigns/cron_test.go b/core/tasks/campaigns/cron_test.go
@@ -76,7 +76,7 @@ func TestQueueEventFires(t *testing.T) {
 	err = campaigns.QueueEventFires(ctx, rt)
 	assert.NoError(t, err)
 
-	queuedTasks := testsuite.CurrentOrgTasks(t, rp)
+	queuedTasks := testsuite.CurrentTasks(t, rp)
 	org1Tasks := queuedTasks[testdata.Org1.ID]
 
 	assert.Equal(t, 2, len(org1Tasks))
@@ -202,7 +202,7 @@ func TestIVRCampaigns(t *testing.T) {
 }
 
 func assertFireTasks(t *testing.T, rp *redis.Pool, org *testdata.Org, expected [][]models.FireID) {
-	allTasks := testsuite.CurrentOrgTasks(t, rp)
+	allTasks := testsuite.CurrentTasks(t, rp)
 	actual := make([][]models.FireID, len(allTasks[org.ID]))
 
 	for i, task := range allTasks[org.ID] {

diff --git a/core/tasks/schedules/cron.go b/core/tasks/schedules/cron.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/nyaruka/gocommon/uuids"
 	"github.com/nyaruka/mailroom"
 	"github.com/nyaruka/mailroom/core/models"
 	"github.com/nyaruka/mailroom/core/queue"
@@ -85,6 +86,7 @@ func checkSchedules(ctx context.Context, rt *runtime.Runtime) error {
 
 		} else if s.FlowStart() != nil {
 			start := s.FlowStart()
+			start.UUID = uuids.New()
 
 			// insert our flow start
 			err := models.InsertFlowStarts(ctx, tx, []*models.FlowStart{start})