Add Ticket.opened_by and opened_in and set when opening tickets

core/handlers/base_test.go

@@ -39,6 +39,7 @@ type TestCase struct {
 	Actions       ContactActionMap
 	Msgs          ContactMsgMap
 	Modifiers     ContactModifierMap
+	ModifierUser  *testdata.User
 	Assertions    []Assertion
 	SQLAssertions []SQLAssertion
 }
@@ -203,6 +204,11 @@ func RunTestCases(t *testing.T, ctx context.Context, rt *runtime.Runtime, tcs []
 
 		results := make(map[models.ContactID]modifyResult)
 
+		var modifierUser *models.User
+		if tc.ModifierUser != nil {
+			modifierUser = oa.UserByID(tc.ModifierUser.ID)
+		}
+
 		// create scenes for our contacts
 		scenes := make([]*models.Scene, 0, len(tc.Modifiers))
 		for contact, mods := range tc.Modifiers {
@@ -218,7 +224,7 @@ func RunTestCases(t *testing.T, ctx context.Context, rt *runtime.Runtime, tcs []
 				Events:  make([]flows.Event, 0, len(mods)),
 			}
 
-			scene := models.NewSceneForContact(flowContact)
+			scene := models.NewSceneForContact(flowContact, modifierUser)
 
 			// apply our modifiers
 			for _, mod := range mods {

core/handlers/ticket_opened.go

@@ -46,9 +46,25 @@ func handleTicketOpened(ctx context.Context, rt *runtime.Runtime, tx *sqlx.Tx, o
 		assigneeID = assignee.ID()
 	}
 
+	var openedByID models.UserID
+	var openedInID models.FlowID
+
+	if scene.User() != nil {
+		openedByID = scene.User().ID()
+	}
+	if scene.Session() != nil {
+		run, _ := scene.Session().FindStep(e.StepUUID())
+		flowAsset, _ := oa.FlowByUUID(run.FlowReference().UUID)
+		if flowAsset != nil {
+			openedInID = flowAsset.(*models.Flow).ID()
+		}
+	}
+
 	ticket := models.NewTicket(
 		event.Ticket.UUID,
 		oa.OrgID(),
+		openedByID,
+		openedInID,
 		scene.ContactID(),
 		ticketer.ID(),
 		event.Ticket.ExternalID,

core/handlers/ticket_opened_test.go

@@ -47,7 +47,7 @@ func TestTicketOpened(t *testing.T) {
 	oa := testdata.Org1.Load(rt)
 
 	// an existing ticket
-	cathyTicket := models.NewTicket(flows.TicketUUID(uuids.New()), testdata.Org1.ID, testdata.Cathy.ID, testdata.Mailgun.ID, "748363", testdata.DefaultTopic.ID, "Who?", models.NilUserID, nil)
+	cathyTicket := models.NewTicket(flows.TicketUUID(uuids.New()), testdata.Org1.ID, testdata.Admin.ID, models.NilFlowID, testdata.Cathy.ID, testdata.Mailgun.ID, "748363", testdata.DefaultTopic.ID, "Who?", models.NilUserID, nil)
 	err := models.InsertTickets(ctx, db, oa, []*models.Ticket{cathyTicket})
 	require.NoError(t, err)
 

core/models/contacts.go

@@ -328,7 +328,7 @@ func LoadContacts(ctx context.Context, db Queryer, oa *OrgAssets, ids []ContactI
 		for _, t := range e.Tickets {
 			ticketer := oa.TicketerByID(t.TicketerID)
 			if ticketer != nil {
-				tickets = append(tickets, NewTicket(t.UUID, oa.OrgID(), contact.ID(), ticketer.ID(), t.ExternalID, t.TopicID, t.Body, t.AssigneeID, nil))
+				tickets = append(tickets, NewTicket(t.UUID, oa.OrgID(), NilUserID, NilFlowID, contact.ID(), ticketer.ID(), t.ExternalID, t.TopicID, t.Body, t.AssigneeID, nil))
 			}
 		}
 		contact.tickets = tickets

core/models/events.go

@@ -14,32 +14,32 @@ import (
 type Scene struct {
 	contact *flows.Contact
 	session *Session
+	user    *User
 
 	preCommits  map[EventCommitHook][]interface{}
 	postCommits map[EventCommitHook][]interface{}
 }
 
 // NewSceneForSession creates a new scene for the passed in session
 func NewSceneForSession(session *Session) *Scene {
-	s := &Scene{
+	return &Scene{
 		contact: session.Contact(),
 		session: session,
 
 		preCommits:  make(map[EventCommitHook][]interface{}),
 		postCommits: make(map[EventCommitHook][]interface{}),
 	}
-	return s
 }
 
 // NewSceneForContact creates a new scene for the passed in contact, session will be nil
-func NewSceneForContact(contact *flows.Contact) *Scene {
-	s := &Scene{
+func NewSceneForContact(contact *flows.Contact, user *User) *Scene {
+	return &Scene{
 		contact: contact,
+		user:    user,
 
 		preCommits:  make(map[EventCommitHook][]interface{}),
 		postCommits: make(map[EventCommitHook][]interface{}),
 	}
-	return s
 }
 
 // SessionID returns the session id for this scene if any
@@ -55,9 +55,10 @@ func (s *Scene) ContactID() ContactID           { return ContactID(s.contact.ID(
 func (s *Scene) ContactUUID() flows.ContactUUID { return s.contact.UUID() }
 
 // Session returns the session for this scene if any
-func (s *Scene) Session() *Session {
-	return s.session
-}
+func (s *Scene) Session() *Session { return s.session }
+
+// User returns the user for this scene if any
+func (s *Scene) User() *User { return s.user }
 
 // AppendToEventPreCommitHook adds a new event to be handled by a pre commit hook
 func (s *Scene) AppendToEventPreCommitHook(hook EventCommitHook, event interface{}) {
@@ -184,11 +185,11 @@ func ApplyEventPostCommitHooks(ctx context.Context, rt *runtime.Runtime, tx *sql
 }
 
 // HandleAndCommitEvents takes a set of contacts and events, handles the events and applies any hooks, and commits everything
-func HandleAndCommitEvents(ctx context.Context, rt *runtime.Runtime, oa *OrgAssets, contactEvents map[*flows.Contact][]flows.Event) error {
+func HandleAndCommitEvents(ctx context.Context, rt *runtime.Runtime, oa *OrgAssets, user *User, contactEvents map[*flows.Contact][]flows.Event) error {
 	// create scenes for each contact
 	scenes := make([]*Scene, 0, len(contactEvents))
 	for contact := range contactEvents {
-		scene := NewSceneForContact(contact)
+		scene := NewSceneForContact(contact, user)
 		scenes = append(scenes, scene)
 	}
 
@@ -237,7 +238,7 @@ func HandleAndCommitEvents(ctx context.Context, rt *runtime.Runtime, oa *OrgAsse
 }
 
 // ApplyModifiers modifies contacts by applying modifiers and handling the resultant events
-func ApplyModifiers(ctx context.Context, rt *runtime.Runtime, oa *OrgAssets, modifiersByContact map[*flows.Contact][]flows.Modifier) (map[*flows.Contact][]flows.Event, error) {
+func ApplyModifiers(ctx context.Context, rt *runtime.Runtime, oa *OrgAssets, user *User, modifiersByContact map[*flows.Contact][]flows.Modifier) (map[*flows.Contact][]flows.Event, error) {
 	// create an environment instance with location support
 	env := flows.NewEnvironment(oa.Env(), oa.SessionAssets().Locations())
 
@@ -252,7 +253,7 @@ func ApplyModifiers(ctx context.Context, rt *runtime.Runtime, oa *OrgAssets, mod
 		eventsByContact[contact] = events
 	}
 
-	err := HandleAndCommitEvents(ctx, rt, oa, eventsByContact)
+	err := HandleAndCommitEvents(ctx, rt, oa, user, eventsByContact)
 	if err != nil {
 		return nil, errors.Wrap(err, "error commiting events")
 	}

core/models/imports.go

@@ -161,7 +161,8 @@ func (b *ContactImportBatch) tryImport(ctx context.Context, rt *runtime.Runtime,
 	}
 
 	// and apply in bulk
-	_, err = ApplyModifiers(ctx, rt, oa, modifiersByContact)
+	// TODO pass user here who created the import?
+	_, err = ApplyModifiers(ctx, rt, oa, nil, modifiersByContact)
 	if err != nil {
 		return errors.Wrap(err, "error applying modifiers")
 	}

core/models/tickets.go

@@ -91,6 +91,8 @@ type Ticket struct {
 		AssigneeID     UserID           `db:"assignee_id"`
 		Config         null.Map         `db:"config"`
 		OpenedOn       time.Time        `db:"opened_on"`
+		OpenedByID     UserID           `db:"opened_by_id"`
+		OpenedInID     FlowID           `db:"opened_in_id"`
 		RepliedOn      *time.Time       `db:"replied_on"`
 		ModifiedOn     time.Time        `db:"modified_on"`
 		ClosedOn       *time.Time       `db:"closed_on"`
@@ -99,10 +101,12 @@ type Ticket struct {
 }
 
 // NewTicket creates a new open ticket
-func NewTicket(uuid flows.TicketUUID, orgID OrgID, contactID ContactID, ticketerID TicketerID, externalID string, topicID TopicID, body string, assigneeID UserID, config map[string]interface{}) *Ticket {
+func NewTicket(uuid flows.TicketUUID, orgID OrgID, userID UserID, flowID FlowID, contactID ContactID, ticketerID TicketerID, externalID string, topicID TopicID, body string, assigneeID UserID, config map[string]interface{}) *Ticket {
 	t := &Ticket{}
 	t.t.UUID = uuid
 	t.t.OrgID = orgID
+	t.t.OpenedByID = userID
+	t.t.OpenedInID = flowID
 	t.t.ContactID = contactID
 	t.t.TicketerID = ticketerID
 	t.t.ExternalID = null.String(externalID)
@@ -184,28 +188,28 @@ func (t *Ticket) ForwardIncoming(ctx context.Context, rt *runtime.Runtime, oa *O
 
 const sqlSelectOpenTickets = `
 SELECT
-  t.id AS id,
-  t.uuid AS uuid,
-  t.org_id AS org_id,
-  t.contact_id AS contact_id,
-  t.ticketer_id AS ticketer_id,
-  t.external_id AS external_id,
-  t.status AS status,
-  t.topic_id AS topic_id,
-  t.body AS body,
-  t.assignee_id AS assignee_id,
-  t.config AS config,
-  t.opened_on AS opened_on,
+  t.id,
+  t.uuid,
+  t.org_id,
+  t.contact_id,
+  t.ticketer_id,
+  t.external_id,
+  t.status,
+  t.topic_id,
+  t.body,
+  t.assignee_id,
+  t.config,
+  t.opened_on,
+  t.opened_by_id,
+  t.opened_in_id,
   t.replied_on,
-  t.modified_on AS modified_on,
-  t.closed_on AS closed_on,
-  t.last_activity_on AS last_activity_on
+  t.modified_on,
+  t.closed_on,
+  t.last_activity_on
 FROM
   tickets_ticket t
 WHERE
-  t.contact_id = $1 AND
-  t.status = 'O'
-`
+  t.contact_id = $1 AND t.status = 'O'`
 
 // LoadOpenTicketsForContact looks up the open tickets for the passed in contact
 func LoadOpenTicketsForContact(ctx context.Context, db Queryer, contact *Contact) ([]*Ticket, error) {
@@ -214,27 +218,28 @@ func LoadOpenTicketsForContact(ctx context.Context, db Queryer, contact *Contact
 
 const sqlSelectTicketsByID = `
 SELECT
-  t.id AS id,
-  t.uuid AS uuid,
-  t.org_id AS org_id,
-  t.contact_id AS contact_id,
-  t.ticketer_id AS ticketer_id,
-  t.external_id AS external_id,
-  t.status AS status,
-  t.topic_id AS topic_id,
-  t.body AS body,
-  t.assignee_id AS assignee_id,
-  t.config AS config,
-  t.opened_on AS opened_on,
+  t.id,
+  t.uuid,
+  t.org_id,
+  t.contact_id,
+  t.ticketer_id,
+  t.external_id,
+  t.status,
+  t.topic_id,
+  t.body,
+  t.assignee_id,
+  t.config,
+  t.opened_on,
+  t.opened_by_id,
+  t.opened_in_id,
   t.replied_on,
-  t.modified_on AS modified_on,
-  t.closed_on AS closed_on,
-  t.last_activity_on AS last_activity_on
+  t.modified_on,
+  t.closed_on,
+  t.last_activity_on
 FROM
   tickets_ticket t
 WHERE
-  t.id = ANY($1)
-`
+  t.id = ANY($1)`
 
 // LoadTickets loads all of the tickets with the given ids
 func LoadTickets(ctx context.Context, db Queryer, ids []TicketID) ([]*Ticket, error) {
@@ -263,27 +268,28 @@ func loadTickets(ctx context.Context, db Queryer, query string, params ...interf
 
 const sqlSelectTicketByUUID = `
 SELECT
-  t.id AS id,
-  t.uuid AS uuid,
-  t.org_id AS org_id,
-  t.contact_id AS contact_id,
-  t.ticketer_id AS ticketer_id,
-  t.external_id AS external_id,
-  t.status AS status,
-  t.topic_id AS topic_id,
-  t.body AS body,
-  t.assignee_id AS assignee_id,
-  t.config AS config,
-  t.opened_on AS opened_on,
+  t.id,
+  t.uuid,
+  t.org_id,
+  t.contact_id,
+  t.ticketer_id,
+  t.external_id,
+  t.status,
+  t.topic_id,
+  t.body,
+  t.assignee_id,
+  t.config,
+  t.opened_on,
+  t.opened_by_id,
+  t.opened_in_id,
   t.replied_on,
-  t.modified_on AS modified_on,
-  t.closed_on AS closed_on,
-  t.last_activity_on AS last_activity_on
+  t.modified_on,
+  t.closed_on,
+  t.last_activity_on
 FROM
   tickets_ticket t
 WHERE
-  t.uuid = $1
-`
+  t.uuid = $1`
 
 // LookupTicketByUUID looks up the ticket with the passed in UUID
 func LookupTicketByUUID(ctx context.Context, db *sqlx.DB, uuid flows.TicketUUID) (*Ticket, error) {
@@ -292,28 +298,28 @@ func LookupTicketByUUID(ctx context.Context, db *sqlx.DB, uuid flows.TicketUUID)
 
 const sqlSelectTicketByExternalID = `
 SELECT
-  t.id AS id,
-  t.uuid AS uuid,
-  t.org_id AS org_id,
-  t.contact_id AS contact_id,
-  t.ticketer_id AS ticketer_id,
-  t.external_id AS external_id,
-  t.status AS status,
-  t.topic_id AS topic_id,
-  t.body AS body,
-  t.assignee_id AS assignee_id,
-  t.config AS config,
-  t.opened_on AS opened_on,
+  t.id,
+  t.uuid,
+  t.org_id,
+  t.contact_id,
+  t.ticketer_id,
+  t.external_id,
+  t.status,
+  t.topic_id,
+  t.body,
+  t.assignee_id,
+  t.config,
+  t.opened_on,
+  t.opened_by_id,
+  t.opened_in_id,
   t.replied_on,
-  t.modified_on AS modified_on,
-  t.closed_on AS closed_on,
-  t.last_activity_on AS last_activity_on
+  t.modified_on,
+  t.closed_on,
+  t.last_activity_on
 FROM
   tickets_ticket t
 WHERE
-  t.ticketer_id = $1 AND
-  t.external_id = $2
-`
+  t.ticketer_id = $1 AND t.external_id = $2`
 
 // LookupTicketByExternalID looks up the ticket with the passed in ticketer and external ID
 func LookupTicketByExternalID(ctx context.Context, db Queryer, ticketerID TicketerID, externalID string) (*Ticket, error) {
@@ -342,8 +348,8 @@ func lookupTicket(ctx context.Context, db Queryer, query string, params ...inter
 
 const sqlInsertTicket = `
 INSERT INTO 
-  tickets_ticket(uuid,  org_id,  contact_id,  ticketer_id,  external_id,  status,  topic_id,  body,  assignee_id,  config,  opened_on, modified_on, last_activity_on)
-  VALUES(        :uuid, :org_id, :contact_id, :ticketer_id, :external_id, :status, :topic_id, :body, :assignee_id, :config, NOW(),     NOW()      , NOW())
+  tickets_ticket(uuid,  org_id,  contact_id,  ticketer_id,  external_id,  status,  topic_id,  body,  assignee_id,  config,  opened_on, opened_by_id,  opened_in_id,  modified_on, last_activity_on)
+  VALUES(        :uuid, :org_id, :contact_id, :ticketer_id, :external_id, :status, :topic_id, :body, :assignee_id, :config, NOW(),     :opened_by_id, :opened_in_id, NOW()      , NOW())
 RETURNING
   id
 `