Skip to content

A platform for community discussion. Free, open, simple.

FIX: Don't emit tag names/slugs in topic tracking state (#40117)

Alan Guo Xiang Tan67b1b9ca5e39
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index c0ebd689b6c..b224b74f063 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -354,7 +354,7 @@ class TopicTrackingState
#{sql}
)
SELECT *, (
- SELECT JSON_AGG(JSON_BUILD_OBJECT('id', tags.id, 'name', tags.name, 'slug', tags.slug))
+ SELECT JSON_AGG(JSON_BUILD_OBJECT('id', tags.id))
FROM topic_tags
JOIN tags ON tags.id = topic_tags.tag_id
WHERE topic_id = tags_included_cte.topic_id
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index feed1aecce9..c0aa90daa65 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -761,7 +761,9 @@ RSpec.describe TopicTrackingState do
report = TopicTrackingState.report(user)
expect(report.length).to eq(1)
row = report[0]
- expect(row.tags.map { |t| t["name"] }).to contain_exactly("apples", "bananas")
+ expect(row.tags.map { |t| t["id"] }).to contain_exactly(
+ *Tag.where(name: %w[apples bananas]).pluck(:id),
+ )
end
end
diff --git a/spec/serializers/topic_tracking_state_item_serializer_spec.rb b/spec/serializers/topic_tracking_state_item_serializer_spec.rb
index 9546884700f..4a457bbbca0 100644
--- a/spec/serializers/topic_tracking_state_item_serializer_spec.rb
+++ b/spec/serializers/topic_tracking_state_item_serializer_spec.rb
@@ -31,6 +31,8 @@ RSpec.describe TopicTrackingStateItemSerializer do
report = TopicTrackingState.report(user)
serialized = described_class.new(report[0], scope: Guardian.new(user), root: false).as_json
- expect(serialized[:tags].map { |t| t["name"] }).to contain_exactly("bananas", "apples")
+ expect(serialized[:tags].map { |t| t["id"] }).to contain_exactly(
+ *Tag.where(name: %w[bananas apples]).pluck(:id),
+ )
end
end