Merge pull request #425 from nyaruka/fires_fix

Fix contact fires being created before sessions have ids

core/models/sessions.go

@@ -592,8 +592,6 @@ func InsertSessions(ctx context.Context, rt *runtime.Runtime, tx *sqlx.Tx, oa *O
 				completedCallIDs = append(completedCallIDs, session.call.ID())
 			}
 		}
-
-		fires = append(fires, session.GetNewFires(oa, sprints[i])...)
 	}
 
 	// call our global pre commit hook if present
@@ -637,14 +635,15 @@ func InsertSessions(ctx context.Context, rt *runtime.Runtime, tx *sqlx.Tx, oa *O
 		return nil, fmt.Errorf("error inserting waiting sessions: %w", err)
 	}
 
-	// gather all runs across all sessions
+	// now that sessions have ids, set it on runs and generates fires
 	runs := make([]*FlowRun, 0, len(sessions))
-	for _, s := range sessions {
+	for i, s := range sessions {
 		for _, r := range s.runs {
-			r.SessionID = s.ID() // set our session id now that it is written
-
+			r.SessionID = s.ID()
 			runs = append(runs, r)
 		}
+
+		fires = append(fires, s.GetNewFires(oa, sprints[i])...)
 	}
 
 	// insert all runs

core/models/sessions_test.go

@@ -66,8 +66,8 @@ func TestSessionCreationAndUpdating(t *testing.T) {
 		})
 
 	// check we have contact fires for wait expiration and timeout
-	assertdb.Query(t, rt.DB, `SELECT count(*) FROM contacts_contactfire WHERE contact_id = $1 AND fire_type = 'E' AND scope = ''`, testdata.Bob.ID).Returns(1)
-	assertdb.Query(t, rt.DB, `SELECT count(*) FROM contacts_contactfire WHERE contact_id = $1 AND fire_type = 'T' AND scope = ''`, testdata.Bob.ID).Returns(1)
+	assertdb.Query(t, rt.DB, `SELECT count(*) FROM contacts_contactfire WHERE contact_id = $1 AND fire_type = 'E' AND scope = '' AND extra->'session_id' = $2`, testdata.Bob.ID, modelSessions[0].ID()).Returns(1)
+	assertdb.Query(t, rt.DB, `SELECT count(*) FROM contacts_contactfire WHERE contact_id = $1 AND fire_type = 'T' AND scope = '' AND extra->'session_id' = $2`, testdata.Bob.ID, modelSessions[0].ID()).Returns(1)
 
 	// reload contact and check current flow is set
 	modelContact, _, _ = testdata.Bob.Load(rt, oa)