Stop writing is_blocked and is_stopped

hooks/contact_status_changed_test.go

@@ -14,7 +14,7 @@ func TestContactStatusChanged(t *testing.T) {
 	db := testsuite.DB()
 
 	// make sure cathyID contact is active
-	db.Exec(`UPDATE contacts_contact SET status = 'A', is_blocked = FALSE, is_stopped = FALSE WHERE id = $1`, models.CathyID)
+	db.Exec(`UPDATE contacts_contact SET status = 'A' WHERE id = $1`, models.CathyID)
 
 	tcs := []HookTestCase{
 		{
@@ -23,7 +23,7 @@ func TestContactStatusChanged(t *testing.T) {
 			},
 			SQLAssertions: []SQLAssertion{
 				{
-					SQL:   `select count(*) from contacts_contact where id = $1 AND status = 'B' AND is_blocked = TRUE`,
+					SQL:   `select count(*) from contacts_contact where id = $1 AND status = 'B'`,
 					Args:  []interface{}{models.CathyID},
 					Count: 1,
 				},
@@ -35,7 +35,7 @@ func TestContactStatusChanged(t *testing.T) {
 			},
 			SQLAssertions: []SQLAssertion{
 				{
-					SQL:   `select count(*) from contacts_contact where id = $1 AND status = 'S' AND is_stopped = TRUE`,
+					SQL:   `select count(*) from contacts_contact where id = $1 AND status = 'S'`,
 					Args:  []interface{}{models.CathyID},
 					Count: 1,
 				},
@@ -47,12 +47,12 @@ func TestContactStatusChanged(t *testing.T) {
 			},
 			SQLAssertions: []SQLAssertion{
 				{
-					SQL:   `select count(*) from contacts_contact where id = $1 AND status = 'A' AND is_stopped = FALSE`,
+					SQL:   `select count(*) from contacts_contact where id = $1 AND status = 'A'`,
 					Args:  []interface{}{models.CathyID},
 					Count: 1,
 				},
 				{
-					SQL:   `select count(*) from contacts_contact where id = $1 AND status = 'A' AND is_blocked = FALSE`,
+					SQL:   `select count(*) from contacts_contact where id = $1 AND status = 'A'`,
 					Args:  []interface{}{models.CathyID},
 					Count: 1,
 				},

models/contacts.go

@@ -388,9 +388,9 @@ func (c *Contact) URNForID(urnID URNID) urns.URN {
 	return urns.NilURN
 }
 
-// Unstop sets the is_stopped attribute to false for this contact
+// Unstop sets the status to stopped for this contact
 func (c *Contact) Unstop(ctx context.Context, db *sqlx.DB) error {
-	_, err := db.ExecContext(ctx, `UPDATE contacts_contact SET status = 'A', is_stopped = FALSE, modified_on = NOW() WHERE id = $1`, c.id)
+	_, err := db.ExecContext(ctx, `UPDATE contacts_contact SET status = 'A', modified_on = NOW() WHERE id = $1`, c.id)
 	if err != nil {
 		return errors.Wrapf(err, "error unstopping contact")
 	}
@@ -630,9 +630,9 @@ func CreateContact(ctx context.Context, db *sqlx.DB, org *OrgAssets, urn urns.UR
 	err = tx.GetContext(ctx, &contactID,
 		`INSERT INTO 
 		contacts_contact
-			(org_id, is_active, status, is_blocked, is_stopped, uuid, created_on, modified_on, created_by_id, modified_by_id, name) 
+			(org_id, is_active, status, uuid, created_on, modified_on, created_by_id, modified_by_id, name) 
 		VALUES
-			($1, TRUE, 'A', FALSE, FALSE, $2, NOW(), NOW(), 1, 1, '')
+			($1, TRUE, 'A', $2, NOW(), NOW(), 1, 1, '')
 		RETURNING id`,
 		org.OrgID(), uuids.New(),
 	)
@@ -932,7 +932,6 @@ const markContactStoppedSQL = `
 UPDATE
 	contacts_contact
 SET
-	is_stopped = TRUE,
 	status = 'S',
 	modified_on = NOW()
 WHERE 
@@ -1330,8 +1329,6 @@ type ContactStatusChange struct {
 type contactStatusUpdate struct {
 	ContactID ContactID     `db:"id"`
 	Status    ContactStatus `db:"status"`
-	Blocked   bool          `db:"is_blocked"`
-	Stopped   bool          `db:"is_stopped"`
 }
 
 // UpdateContactStatus updates the contacts status as the passed changes
@@ -1354,8 +1351,6 @@ func UpdateContactStatus(ctx context.Context, tx Queryer, changes []*ContactStat
 			&contactStatusUpdate{
 				ContactID: ch.ContactID,
 				Status:    status,
-				Blocked:   blocked,
-				Stopped:   stopped,
 			},
 		)
 
@@ -1380,13 +1375,11 @@ const updateContactStatusSQL = `
 		contacts_contact c
 	SET
 		status = r.status,
-		is_blocked = r.is_blocked::boolean,
-		is_stopped = r.is_stopped::boolean,
 		modified_on = NOW()
 	FROM (
-		VALUES(:id, :status, :is_blocked, :is_stopped)
+		VALUES(:id, :status)
 	) AS
-		r(id, status, is_blocked, is_stopped)
+		r(id, status)
 	WHERE
 		c.id = r.id::int
 `

models/contacts_test.go

@@ -329,7 +329,7 @@ func TestStopContact(t *testing.T) {
 	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contactgroup_contacts WHERE contact_id = $1`, []interface{}{CathyID}, 1)
 
 	// verify she's stopped
-	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S' AND is_stopped = TRUE AND is_active = TRUE and is_blocked = FALSE`, []interface{}{CathyID}, 1)
+	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S' AND is_active = TRUE`, []interface{}{CathyID}, 1)
 }
 
 func TestUpdateContactLastSeenAndModifiedOn(t *testing.T) {
@@ -405,24 +405,24 @@ func TestUpdateContactStatus(t *testing.T) {
 	err := UpdateContactStatus(ctx, db, []*ContactStatusChange{})
 	assert.NoError(t, err)
 
-	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'B' AND is_blocked = TRUE`, []interface{}{CathyID}, 0)
-	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S' AND is_stopped = TRUE`, []interface{}{CathyID}, 0)
+	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'B'`, []interface{}{CathyID}, 0)
+	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S'`, []interface{}{CathyID}, 0)
 
 	changes := make([]*ContactStatusChange, 0, 1)
 	changes = append(changes, &ContactStatusChange{CathyID, flows.ContactStatusBlocked})
 
 	err = UpdateContactStatus(ctx, db, changes)
 
-	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'B' AND is_blocked = TRUE`, []interface{}{CathyID}, 1)
-	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S' AND is_stopped = TRUE`, []interface{}{CathyID}, 0)
+	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'B'`, []interface{}{CathyID}, 1)
+	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S'`, []interface{}{CathyID}, 0)
 
 	changes = make([]*ContactStatusChange, 0, 1)
 	changes = append(changes, &ContactStatusChange{CathyID, flows.ContactStatusStopped})
 
 	err = UpdateContactStatus(ctx, db, changes)
 
-	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'B' AND is_blocked = TRUE`, []interface{}{CathyID}, 0)
-	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S' AND is_stopped = TRUE`, []interface{}{CathyID}, 1)
+	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'B'`, []interface{}{CathyID}, 0)
+	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S'`, []interface{}{CathyID}, 1)
 
 }
 

tasks/handler/handler_test.go

@@ -347,7 +347,7 @@ func TestStopEvent(t *testing.T) {
 	testsuite.AssertQueryCount(t, db, `SELECT count(*) from contacts_contactgroup_contacts WHERE contactgroup_id = $1 AND contact_id = $2`, []interface{}{models.DoctorsGroupID, models.GeorgeID}, 1)
 
 	// that cathy is stopped
-	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S' AND is_stopped = TRUE`, []interface{}{models.CathyID}, 1)
+	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM contacts_contact WHERE id = $1 AND status = 'S'`, []interface{}{models.CathyID}, 1)
 
 	// and has no upcoming events
 	testsuite.AssertQueryCount(t, db, `SELECT count(*) FROM campaigns_eventfire WHERE contact_id = $1`, []interface{}{models.CathyID}, 0)