remove deprecated columns

strideynet · Aug 10, 2023 · cd9fa99 · cd9fa99
1 parent 721ddd4
commit cd9fa99
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 34 deletions.
diff --git a/ingester/ingester_test.go b/ingester/ingester_test.go
@@ -259,8 +259,6 @@ func TestFirehoseIngester(t *testing.T) {
 							out,
 							// We can't know IndexedAt ahead of time.
 							cmpopts.IgnoreFields(gen.CandidatePost{}, "IndexedAt"),
-							// Ignore tags, we're deprecating it.
-							cmpopts.IgnoreFields(gen.CandidatePost{}, "Tags"),
 							cmpopts.SortSlices(func(a, b string) bool { return a < b }),
 						),
 					)

diff --git a/proto/bff/v1/moderation_service.proto b/proto/bff/v1/moderation_service.proto
@@ -50,7 +50,7 @@ message Actor {
   // is_hidden is a deprecated flag that used to hide accounts. This no longer
   // has any effect.
   // Deprecated: Use status.
-  bool is_hidden = 2;
+  reserved 2;
   // is_artist is a flag indicating this account is primarily an artist. It
   // does not currently control any feed placement.
   bool is_artist = 3;

diff --git a/store/gen/candidate_actors.sql.go b/store/gen/candidate_actors.sql.go
diff --git a/store/gen/candidate_posts.sql.go b/store/gen/candidate_posts.sql.go
diff --git a/store/gen/models.go b/store/gen/models.go
diff --git a/store/migrations/000016_remove_deprecated_columns.down.sql b/store/migrations/000016_remove_deprecated_columns.down.sql
@@ -0,0 +1,6 @@
+ALTER TABLE candidate_posts ADD COLUMN tags TEXT[] DEFAULT ARRAY[]::TEXT[] NOT NULL;
+ALTER TABLE candidate_posts ADD COLUMN is_nsfw BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE candidate_actors ADD COLUMN is_nsfw BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE candidate_actors ADD COLUMN is_hidden BOOLEAN NOT NULL DEFAULT FALSE;
+DELETE FROM candidate_posts WHERE raw IS NULL;
+ALTER TABLE candidate_posts ALTER COLUMN raw SET NOT NULL;
diff --git a/store/migrations/000016_remove_deprecated_columns.up.sql b/store/migrations/000016_remove_deprecated_columns.up.sql
@@ -0,0 +1,4 @@
+ALTER TABLE candidate_posts DROP COLUMN tags;
+ALTER TABLE candidate_posts DROP COLUMN is_nsfw;
+ALTER TABLE candidate_actors DROP COLUMN is_nsfw;
+ALTER TABLE candidate_actors DROP COLUMN is_hidden;
diff --git a/store/postgres.go b/store/postgres.go
@@ -95,7 +95,6 @@ func actorToProto(actor gen.CandidateActor) (*v1.Actor, error) {
 	}
 	return &v1.Actor{
 		Did:       actor.DID,
-		IsHidden:  actor.IsHidden,
 		IsArtist:  actor.IsArtist,
 		Comment:   actor.Comment,
 		Status:    status,