Merge pull request #836 from nyaruka/remove_contact_created_by_modified_by

Stop writing `Contact.created_by` and `modified_by` as these are nullable

Author: rowanseymour

Diff for: backends/rapidpro/contact.go

@@ -52,25 +52,21 @@ 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"`
-
 	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)
-RETURNING id
-`
+	contacts_contact( org_id, is_active, status, uuid,  created_on,  modified_on,  name, ticket_count) 
+              VALUES(:org_id, TRUE,      'A',   :uuid, :created_on, :modified_on, :name, 0)
+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
 	}
@@ -166,10 +162,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

@@ -36,8 +36,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,
+    modified_by_id integer,
     org_id integer references orgs_org(id) on delete cascade
 );