Stop writing Msg.queued_on

Author: rowanseymour

Diff for: backends/rapidpro/backend_test.go

@@ -1135,7 +1135,6 @@ func (ts *BackendTestSuite) TestWriteMsg() {
 	ts.NotNil(m.NextAttempt_)
 	ts.NotNil(m.CreatedOn_)
 	ts.NotNil(m.ModifiedOn_)
-	ts.NotNil(m.QueuedOn_)
 
 	contact, err := contactForURN(ctx, ts.b, m.OrgID_, knChannel, urn, nil, "", clog)
 	ts.NoError(err)
@@ -1532,7 +1531,6 @@ SELECT
 	created_on,
 	modified_on,
 	next_attempt,
-	queued_on,
 	sent_on,
 	log_uuids
 FROM

Diff for: backends/rapidpro/msg.go

@@ -72,7 +72,6 @@ type Msg struct {
 	NextAttempt_ time.Time      `                     db:"next_attempt"`
 	CreatedOn_   time.Time      `json:"created_on"    db:"created_on"`
 	ModifiedOn_  time.Time      `                     db:"modified_on"`
-	QueuedOn_    time.Time      `                     db:"queued_on"`
 	SentOn_      *time.Time     `                     db:"sent_on"`
 	LogUUIDs     pq.StringArray `                     db:"log_uuids"`
 
@@ -125,7 +124,6 @@ func newMsg(direction MsgDirection, channel courier.Channel, urn urns.URN, text
 		NextAttempt_: now,
 		CreatedOn_:   now,
 		ModifiedOn_:  now,
-		QueuedOn_:    now,
 		LogUUIDs:     []string{string(clog.UUID())},
 
 		channel:        dbChannel,
@@ -247,9 +245,9 @@ func writeMsg(ctx context.Context, b *backend, msg courier.MsgIn, clog *courier.
 const sqlInsertMsg = `
 INSERT INTO
 	msgs_msg(org_id, uuid, direction, text, attachments, msg_type, msg_count, error_count, high_priority, status,
-             visibility, external_id, channel_id, contact_id, contact_urn_id, created_on, modified_on, next_attempt, queued_on, sent_on, log_uuids)
+             visibility, external_id, channel_id, contact_id, contact_urn_id, created_on, modified_on, next_attempt, sent_on, log_uuids)
     VALUES(:org_id, :uuid, :direction, :text, :attachments, 'T', :msg_count, :error_count, :high_priority, :status,
-           :visibility, :external_id, :channel_id, :contact_id, :contact_urn_id, :created_on, :modified_on, :next_attempt, :queued_on, :sent_on, :log_uuids)
+           :visibility, :external_id, :channel_id, :contact_id, :contact_urn_id, :created_on, :modified_on, :next_attempt, :sent_on, :log_uuids)
 RETURNING id`
 
 func writeMsgToDB(ctx context.Context, b *backend, m *Msg, clog *courier.ChannelLog) error {

Diff for: backends/rapidpro/schema.sql

@@ -76,7 +76,6 @@ CREATE TABLE msgs_msg (
     created_on timestamp with time zone NOT NULL,
     modified_on timestamp with time zone,
     sent_on timestamp with time zone,
-    queued_on timestamp with time zone,
     direction character varying(1) NOT NULL,
     status character varying(1) NOT NULL,
     visibility character varying(1) NOT NULL,

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", "queued_on", "direction", "status", "visibility", "msg_type",
+INSERT INTO msgs_msg("id", "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(), now(), 'O', 'W', 'V', 'T',
+              VALUES(10000, '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", "queued_on", "direction", "status", "visibility", "msg_type",
+INSERT INTO msgs_msg("id", "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(), now(), 'O', 'W', 'V', 'T',
+              VALUES(10001, '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", "queued_on", "direction", "status", "visibility", "msg_type",
+INSERT INTO msgs_msg("id", "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(), now(), 'I', 'P', 'V', 'T',
+              VALUES(10002, '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")