discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: n+1 assignment (#205) 

We are preloading assigned_to for topic list https://github.com/discourse/discourse-assign/blob/main/plugin.rb#L214

Therefore instead of checking assignment, we should use assigned_to directly on topics for serializers
This commit is contained in:
Krzysztof Kotlarek 2021-09-15 08:24:37 +10:00 committed by GitHub
parent 463b1c2cf0
commit b172ca604c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/assigned_topic_serializer.rb
View File

@ -25,6 +25,6 @@ class AssignedTopicSerializer < BasicTopicSerializer
end
def include_assigned_to_group?
object.assignment.assigned_to_group?
object.assigned_to.is_a?(Group)
end
end

20
plugin.rb
View File

@ -412,7 +412,7 @@ after_initialize do
end
add_to_serializer(:topic_view, :include_assigned_to_user?) do
(SiteSetting.assigns_public || scope.can_assign?) && object.topic.assignment&.assigned_to_user?
(SiteSetting.assigns_public || scope.can_assign?) && object.topic.assigned_to&.is_a?(User)
end
add_to_serializer(:topic_view, :assigned_to_group, false) do
@ -420,7 +420,7 @@ after_initialize do
end
add_to_serializer(:topic_view, :include_assigned_to_group?) do
(SiteSetting.assigns_public || scope.can_assign?) && object.topic.assignment&.assigned_to_group?
(SiteSetting.assigns_public || scope.can_assign?) && object.topic.assigned_to&.is_a?(Group)
end
# SuggestedTopic serializer
@ -429,7 +429,7 @@ after_initialize do
end
add_to_serializer(:suggested_topic, :include_assigned_to_user?) do
(SiteSetting.assigns_public || scope.can_assign?) && object.assignment&.assigned_to_user?
(SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(User)
end
add_to_serializer(:suggested_topic, :assigned_to_group, false) do
@ -437,7 +437,7 @@ after_initialize do
end
add_to_serializer(:suggested_topic, :include_assigned_to_group?) do
(SiteSetting.assigns_public || scope.can_assign?) && object.assignment&.assigned_to_group?
(SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(Group)
end
# TopicListItem serializer
@ -446,7 +446,7 @@ after_initialize do
end
add_to_serializer(:topic_list_item, :include_assigned_to_user?) do
(SiteSetting.assigns_public || scope.can_assign?) && object.assignment&.assigned_to_user?
(SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(User)
end
add_to_serializer(:topic_list_item, :assigned_to_group) do
@ -454,7 +454,7 @@ after_initialize do
end
add_to_serializer(:topic_list_item, :include_assigned_to_group?) do
(SiteSetting.assigns_public || scope.can_assign?) && object.assignment&.assigned_to_group?
(SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(Group)
end
# SearchTopicListItem serializer
@ -463,7 +463,7 @@ after_initialize do
end
add_to_serializer(:search_topic_list_item, 'include_assigned_to_user?') do
(SiteSetting.assigns_public || scope.can_assign?) && object.assignment&.assigned_to_user?
(SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(User)
end
add_to_serializer(:search_topic_list_item, :assigned_to_group, false) do
@ -471,7 +471,7 @@ after_initialize do
end
add_to_serializer(:search_topic_list_item, 'include_assigned_to_group?') do
(SiteSetting.assigns_public || scope.can_assign?) && object.assignment&.assigned_to_group?
(SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(Group)
end
# TopicsBulkAction
@ -524,7 +524,7 @@ after_initialize do
end
add_to_serializer(:flagged_topic, :include_assigned_to_user?) do
object.assignment&.assigned_to_user?
object.assigned_to && object.assigned_to&.is_a?(User)
end
add_to_serializer(:flagged_topic, :assigned_to_group) do
@ -532,7 +532,7 @@ after_initialize do
end
add_to_serializer(:flagged_topic, :include_assigned_to_group?) do
object.assignment&.assigned_to_group?
object.assigned_to && object.assigned_to&.is_a?(Group)
end
# Reviewable