User system user for new contacts

Author: rowanseymour

Diff for: backends/rapidpro/backend.go

@@ -58,11 +58,12 @@ type backend struct {
 	dyLogWriter  *DynamoLogWriter // all logs being written to dynamo
 	writerWG     *sync.WaitGroup
 
-	db     *sqlx.DB
-	rp     *redis.Pool
-	dynamo *dynamo.Service
-	s3     *s3x.Service
-	cw     *cwatch.Service
+	db           *sqlx.DB
+	rp           *redis.Pool
+	dynamo       *dynamo.Service
+	s3           *s3x.Service
+	cw           *cwatch.Service
+	systemUserID UserID
 
 	channelsByUUID *cache.Local[courier.ChannelUUID, *Channel]
 	channelsByAddr *cache.Local[courier.ChannelAddress, *Channel]
@@ -232,6 +233,12 @@ func (b *backend) Start() error {
 	b.dyLogWriter = NewDynamoLogWriter(b.dynamo, b.writerWG)
 	b.dyLogWriter.Start()
 
+	// store the system user id
+	b.systemUserID, err = getSystemUserID(ctx, b.db)
+	if err != nil {
+		return err
+	}
+
 	// register and start our spool flushers
 	courier.RegisterFlusher(path.Join(b.config.SpoolDir, "msgs"), b.flushMsgFile)
 	courier.RegisterFlusher(path.Join(b.config.SpoolDir, "statuses"), b.flushStatusFile)

Diff for: backends/rapidpro/contact.go

@@ -52,16 +52,16 @@ type Contact struct {
 	CreatedOn_  time.Time `db:"created_on"`
 	ModifiedOn_ time.Time `db:"modified_on"`
 
-	CreatedBy_  int `db:"created_by_id"`
-	ModifiedBy_ int `db:"modified_by_id"`
+	CreatedBy_  UserID `db:"created_by_id"`
+	ModifiedBy_ UserID `db:"modified_by_id"`
 
 	IsNew_ bool
 }
 
 // UUID returns the UUID for this contact
 func (c *Contact) UUID() courier.ContactUUID { return c.UUID_ }
 
-const insertContactSQL = `
+const sqlInsertContact = `
 INSERT INTO 
 	contacts_contact(org_id, is_active, status, uuid, created_on, modified_on, created_by_id, modified_by_id, name, ticket_count) 
               VALUES(:org_id, TRUE, 'A', :uuid, :created_on, :modified_on, :created_by_id, :modified_by_id, :name, 0)
@@ -70,7 +70,7 @@ RETURNING id
 
 // insertContact inserts the passed in contact, the id field will be populated with the result on success
 func insertContact(tx *sqlx.Tx, contact *Contact) error {
-	rows, err := tx.NamedQuery(insertContactSQL, contact)
+	rows, err := tx.NamedQuery(sqlInsertContact, contact)
 	if err != nil {
 		return err
 	}
@@ -134,7 +134,9 @@ func contactForURN(ctx context.Context, b *backend, org OrgID, channel *Channel,
 	contact.OrgID_ = org
 	contact.UUID_ = courier.ContactUUID(uuids.NewV4())
 	contact.CreatedOn_ = time.Now()
+	contact.CreatedBy_ = b.systemUserID
 	contact.ModifiedOn_ = time.Now()
+	contact.ModifiedBy_ = b.systemUserID
 	contact.IsNew_ = true
 
 	// if we aren't an anonymous org, we want to look up a name if possible and set it
@@ -166,10 +168,6 @@ func contactForURN(ctx context.Context, b *backend, org OrgID, channel *Channel,
 		}
 	}
 
-	// TODO: Set these to a system user
-	contact.CreatedBy_ = 1
-	contact.ModifiedBy_ = 1
-
 	// insert it
 	tx, err := b.db.BeginTxx(ctx, nil)
 	if err != nil {

Diff for: backends/rapidpro/schema.sql

@@ -1,3 +1,10 @@
+DROP TABLE IF EXISTS users_user CASCADE;
+CREATE TABLE users_user (
+    id serial primary key,
+    username character varying(254) NOT NULL,
+    first_name character varying(150) NOT NULL
+);
+
 DROP TABLE IF EXISTS orgs_org CASCADE;
 CREATE TABLE orgs_org (
     id serial primary key,
@@ -36,8 +43,8 @@ CREATE TABLE contacts_contact (
     uuid character varying(36) NOT NULL,
     name character varying(128),
     language character varying(3),
-    created_by_id integer NOT NULL,
-    modified_by_id integer NOT NULL,
+    created_by_id integer references users_user(id) NOT NULL,
+    modified_by_id integer references users_user(id) NOT NULL,
     org_id integer references orgs_org(id) on delete cascade
 );
 
@@ -89,7 +96,7 @@ CREATE TABLE msgs_msg (
     --broadcast_id integer REFERENCES msgs_broadcast(id) ON DELETE CASCADE,
     --flow_id integer REFERENCES flows_flow(id) ON DELETE CASCADE,
     --ticket_id integer REFERENCES tickets_ticket(id) ON DELETE CASCADE,
-    --created_by_id integer REFERENCES auth_user(id) ON DELETE CASCADE,
+    created_by_id integer REFERENCES users_user(id),
     text text NOT NULL,
     attachments character varying(255)[] NULL,
     quick_replies character varying(64)[] NULL,

Diff for: backends/rapidpro/testdata.sql

@@ -1,3 +1,6 @@
+DELETE FROM users_user;
+INSERT INTO users_user("id", "username", "first_name") VALUES(1, 'system', 'System');
+              
 /* Org with id 1 */
 DELETE FROM orgs_org;
 INSERT INTO orgs_org("id", "name", "language", "is_anon", "config")

Diff for: backends/rapidpro/user.go

@@ -0,0 +1,20 @@
+package rapidpro
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+)
+
+type UserID int
+
+// gets the system user to use for contact audit fields
+func getSystemUserID(ctx context.Context, db *sqlx.DB) (UserID, error) {
+	var id UserID
+	err := db.GetContext(ctx, &id, "SELECT id FROM users_user WHERE username = 'system'")
+	if err != nil {
+		return 0, fmt.Errorf("error looking up system user: %w", err)
+	}
+	return id, nil
+}