Update test data schema inline with recent RP changes

Author: rowanseymour

Diff for: backends/rapidpro/schema.sql

@@ -66,32 +66,35 @@ CREATE TABLE msgs_optin (
 
 DROP TABLE IF EXISTS msgs_msg CASCADE;
 CREATE TABLE msgs_msg (
-    id bigserial primary key,
-    uuid uuid NULL,
+    id bigserial PRIMARY KEY,
+    uuid uuid NOT NULL,
+    org_id integer NOT NULL REFERENCES orgs_org(id) ON DELETE CASCADE,
+    channel_id integer REFERENCES channels_channel(id) ON DELETE CASCADE,
+    contact_id integer NOT NULL REFERENCES contacts_contact(id) ON DELETE CASCADE,
+    contact_urn_id integer REFERENCES contacts_contacturn(id) ON DELETE CASCADE,
+    --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,
     text text NOT NULL,
     attachments character varying(255)[] NULL,
     quick_replies character varying(64)[] NULL,
+    optin_id integer REFERENCES msgs_optin(id) ON DELETE CASCADE,
     locale character varying(6) NULL,
-    high_priority boolean NULL,
     created_on timestamp with time zone NOT NULL,
-    modified_on timestamp with time zone,
+    modified_on timestamp with time zone NOT NULL,
     sent_on timestamp with time zone,
+    msg_type character varying(1) NOT NULL,
     direction character varying(1) NOT NULL,
     status character varying(1) NOT NULL,
     visibility character varying(1) NOT NULL,
-    msg_type character varying(1) NOT NULL,
     msg_count integer NOT NULL,
+    high_priority boolean NULL,
     error_count integer NOT NULL,
     next_attempt timestamp with time zone NOT NULL,
     failed_reason character varying(1),
     external_id character varying(255),
-    channel_id integer references channels_channel(id) on delete cascade,
-    contact_id integer NOT NULL references contacts_contact(id) on delete cascade,
-    contact_urn_id integer NOT NULL references contacts_contacturn(id) on delete cascade,
-    org_id integer NOT NULL references orgs_org(id) on delete cascade,
     metadata text,
-    optin_id integer references msgs_optin(id) on delete cascade,
-    delete_from_counts boolean,
     log_uuids uuid[]
 );
 

Diff for: backends/rapidpro/testdata.sql

@@ -44,19 +44,19 @@ INSERT INTO msgs_optin(id, uuid, org_id, name) VALUES
 
 /** Msg with id 10000 */
 DELETE FROM msgs_msg;
-INSERT INTO msgs_msg("id", "text", "high_priority", "created_on", "modified_on", "sent_on", "direction", "status", "visibility", "msg_type",
+INSERT INTO msgs_msg("id", "uuid", "text", "high_priority", "created_on", "modified_on", "sent_on", "direction", "status", "visibility", "msg_type",
                         "msg_count", "error_count", "next_attempt", "external_id", "channel_id", "contact_id", "contact_urn_id", "org_id")
-              VALUES(10000, 'test message', True, now(), now(), now(), 'O', 'W', 'V', 'T',
+              VALUES(10000, 'b10fff91-4ff6-46d4-b237-caed786e09d3', 'test message', True, now(), now(), now(), 'O', 'W', 'V', 'T',
                      1, 0, now(), 'ext1', 10, 100, 1000, 1);
 
-INSERT INTO msgs_msg("id", "text", "high_priority", "created_on", "modified_on", "sent_on", "direction", "status", "visibility", "msg_type",
+INSERT INTO msgs_msg("id", "uuid", "text", "high_priority", "created_on", "modified_on", "sent_on", "direction", "status", "visibility", "msg_type",
                         "msg_count", "error_count", "next_attempt", "external_id", "channel_id", "contact_id", "contact_urn_id", "org_id")
-              VALUES(10001, 'test message without external', True, now(), now(), now(), 'O', 'W', 'V', 'T',
+              VALUES(10001, '452adaa9-1e4d-4ff3-a3c6-d3867ff2adfb', 'test message without external', True, now(), now(), now(), 'O', 'W', 'V', 'T',
                      1, 0, now(), '', 10, 100, 1000, 1);
 
-INSERT INTO msgs_msg("id", "text", "high_priority", "created_on", "modified_on", "sent_on", "direction", "status", "visibility", "msg_type",
+INSERT INTO msgs_msg("id", "uuid", "text", "high_priority", "created_on", "modified_on", "sent_on", "direction", "status", "visibility", "msg_type",
                         "msg_count", "error_count", "next_attempt", "external_id", "channel_id", "contact_id", "contact_urn_id", "org_id")
-              VALUES(10002, 'test message incoming', True, now(), now(), now(), 'I', 'P', 'V', 'T',
+              VALUES(10002, '0ee51bf5-b285-4c39-95d6-c85d18b23f1e', 'test message incoming', True, now(), now(), now(), 'I', 'P', 'V', 'T',
                      1, 0, now(), 'ext2', 10, 100, 1000, 1);
 
 INSERT INTO msgs_media("id", "uuid", "org_id", "content_type", "url", "path", "size", "duration", "width", "height", "original_id")