Update to use new users_user table

Author: rowanseymour

core/models/user.go

@@ -23,10 +23,9 @@ type User struct {
 
 const sqlSelectUser = `
 SELECT row_to_json(r) FROM (
-	SELECT u.id, u.email, TRIM(CONCAT(u.first_name, ' ', u.last_name)) AS name, s.avatar
-	FROM auth_user u
-	INNER JOIN orgs_usersettings s ON s.user_id = u.id
-	WHERE u.id = $1 AND u.is_active
+    SELECT id, email, TRIM(CONCAT(u.first_name, ' ', last_name)) AS name, avatar
+    FROM users_user 
+    WHERE id = $1 AND is_active
 ) r`
 
 func LoadUser(ctx context.Context, rt *runtime.Runtime, id UserID) (*User, error) {

testsuite/schema.sql

@@ -54,20 +54,14 @@ CREATE TABLE contacts_contacturn (
     UNIQUE (org_id, identity)
 );
 
-DROP TABLE IF EXISTS auth_user CASCADE;
-CREATE TABLE auth_user (
+DROP TABLE IF EXISTS users_user CASCADE;
+CREATE TABLE users_user (
     id serial primary key,
     email character varying(254) NOT NULL,
     first_name character varying(150),
     last_name character varying(150),
     is_active boolean NOT NULL,
-    is_staff boolean NOT NULL
-);
-
-DROP TABLE IF EXISTS orgs_usersettings CASCADE;
-CREATE TABLE orgs_usersettings (
-    id serial primary key,
-    user_id integer NOT NULL REFERENCES auth_user(id) ON DELETE CASCADE,
+    is_staff boolean NOT NULL,
     avatar character varying(100) NULL
 );
 
@@ -94,7 +88,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) ON DELETE CASCADE,
     text text NOT NULL,
     attachments character varying(255)[] NULL,
     quick_replies character varying(64)[] NULL,

testsuite/testdata.go

@@ -71,14 +71,10 @@ func InsertURN(rt *runtime.Runtime, orgID models.OrgID, contactID models.Contact
 
 func InsertUser(rt *runtime.Runtime, email, firstName, lastName, avatar string) models.UserID {
 	row := rt.DB.QueryRow(
-		`INSERT INTO auth_user(email, first_name, last_name, is_active, is_staff) 
-		VALUES($1, $2, $3, TRUE, FALSE) RETURNING id`, email, firstName, lastName,
+		`INSERT INTO users_user(email, first_name, last_name, is_active, is_staff, avatar) 
+		VALUES($1, $2, $3, TRUE, FALSE, $4) RETURNING id`, email, firstName, lastName, avatar,
 	)
 	var id models.UserID
 	must(row.Scan(&id))
-
-	_, err := rt.DB.Exec(`INSERT INTO orgs_usersettings(user_id, avatar) VALUES($1, $2)`, id, avatar)
-	noError(err)
-
 	return id
 }