Merge pull request #358 from nyaruka/imports2

🚀 Imports 2.0
rapidpro · Sep 30, 2020 · 14ec817 · 14ec817
2 parents 1ad2a3c + 81e279b
commit 14ec817
Show file tree

Hide file tree

Showing 25 changed files with 1,600 additions and 252 deletions.
diff --git a/cmd/mailroom/main.go b/cmd/mailroom/main.go
@@ -19,6 +19,7 @@ import (
 	_ "github.com/nyaruka/mailroom/services/tickets/zendesk"
 	_ "github.com/nyaruka/mailroom/tasks/broadcasts"
 	_ "github.com/nyaruka/mailroom/tasks/campaigns"
+	_ "github.com/nyaruka/mailroom/tasks/contacts"
 	_ "github.com/nyaruka/mailroom/tasks/expirations"
 	_ "github.com/nyaruka/mailroom/tasks/groups"
 	_ "github.com/nyaruka/mailroom/tasks/interrupts"

diff --git a/hooks/session_triggered.go b/hooks/session_triggered.go
@@ -86,7 +86,7 @@ func (h *InsertStartHook) Apply(ctx context.Context, tx *sqlx.Tx, rp *redis.Pool
 			}
 
 			// load our contacts by uuid
-			contactIDs, err := models.ContactIDsFromReferences(ctx, tx, oa, event.Contacts)
+			contactIDs, err := models.GetContactIDsFromReferences(ctx, tx, oa.OrgID(), event.Contacts)
 			if err != nil {
 				return errors.Wrapf(err, "error loading contacts by reference")
 			}

diff --git a/mailroom_test.dump b/mailroom_test.dump