members: fix discount request migration order

Author: jveski

modules/members/schema.sql

@@ -69,8 +69,6 @@ CREATE TABLE IF NOT EXISTS members (
 
 CREATE UNIQUE INDEX IF NOT EXISTS members_email_idx ON members (email);
 
-CREATE UNIQUE INDEX IF NOT EXISTS members_discount_request_id_idx ON members (discount_request_id) WHERE discount_request_id IS NOT NULL;
-
 CREATE UNIQUE INDEX IF NOT EXISTS members_fob_idx ON members (fob_id);
 
 CREATE INDEX IF NOT EXISTS members_fob_last_seen_idx ON members (fob_last_seen);
@@ -117,11 +115,6 @@ CREATE TABLE IF NOT EXISTS fob_swipes (
 
 CREATE INDEX IF NOT EXISTS fob_swipes_fob_id_idx ON fob_swipes (fob_id);
 
-CREATE TRIGGER IF NOT EXISTS no_discount_after_cancelation AFTER UPDATE ON members WHEN OLD.payment_status IS NOT NULL AND NEW.payment_status IS NULL
-BEGIN
-UPDATE members SET discount_type = NULL, discount_status = NULL, discount_request_id = NULL WHERE id = NEW.id;
-END;
-
 CREATE TRIGGER IF NOT EXISTS fob_swipe_to_member AFTER INSERT ON fob_swipes
 BEGIN
 UPDATE members SET fob_last_seen = MAX(COALESCE(fob_last_seen, 0), NEW.timestamp) WHERE fob_id = NEW.fob_id;

modules/members/schema_test.go

@@ -327,6 +327,29 @@ func TestDiscountCancelation(t *testing.T) {
 	assert.Nil(t, requestID)
 }
 
+func TestMigrateMembersAddsDiscountRequestIDBeforeDependentObjects(t *testing.T) {
+	db := NewTestDB(t)
+
+	_, err := db.Exec(`DROP TRIGGER no_discount_after_cancelation`)
+	require.NoError(t, err)
+	_, err = db.Exec(`DROP INDEX members_discount_request_id_idx`)
+	require.NoError(t, err)
+	_, err = db.Exec(`ALTER TABLE members DROP COLUMN discount_request_id`)
+	require.NoError(t, err)
+
+	migrateMembers(db)
+
+	_, err = db.Exec(`INSERT INTO members (id, email, confirmed, discount_type, discount_status, discount_request_id, stripe_subscription_state) VALUES (1, 'foo@bar.com', TRUE, 'anything', 'approved', 'lathe-solder-circuit', 'active')`)
+	require.NoError(t, err)
+	_, err = db.Exec(`UPDATE members SET stripe_subscription_state = NULL`)
+	require.NoError(t, err)
+
+	var requestID *string
+	err = db.QueryRow(`SELECT discount_request_id FROM members`).Scan(&requestID)
+	require.NoError(t, err)
+	assert.Nil(t, requestID)
+}
+
 func eventsToStrings(t *testing.T, db *sql.DB) []string {
 	results, err := db.Query("SELECT event, details FROM member_events")
 	require.NoError(t, err)