mirror of
https://github.com/discourse/discourse.git
synced 2024-12-02 13:39:36 -06:00
3e4621c2cb
This pull request follows on from https://github.com/discourse/discourse/pull/16308. This one does the following:
* Changes `BookmarkQuery` to allow for querying more than just Post and Topic bookmarkables
* Introduces a `Bookmark.register_bookmarkable` method which requires a model, serializer, fields and preload includes for searching. These registered `Bookmarkable` types are then used when validating new bookmarks, and also when determining which serializer to use for the bookmark list. The `Post` and `Topic` bookmarkables are registered by default.
* Adds new specific types for Post and Topic bookmark serializers along with preloading of associations in `UserBookmarkList`
* Changes to the user bookmark list template to allow for more generic bookmarkable types alongside the Post and Topic ones which need to display in a particular way
All of these changes are gated behind the `use_polymorphic_bookmarks` site setting, apart from the .hbs changes where I have updated the original `UserBookmarkSerializer` with some stub methods.
Following this PR will be several plugin PRs (for assign, chat, encrypt) that will register their own bookmarkable types or otherwise alter the bookmark serializers in their own way, also gated behind `use_polymorphic_bookmarks`.
This commit also removes `BookmarkQuery.preloaded_custom_fields` and the functionality surrounding it. It was added in 0cd502a558
but only used by one plugin (discourse-assign) where it has since been removed, and is now used by no plugins. We don't need it anymore.
126 lines
3.8 KiB
Ruby
126 lines
3.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
##
|
|
# Allows us to query Bookmark records for lists. Used mainly
|
|
# in the user/activity/bookmarks page.
|
|
|
|
class BookmarkQuery
|
|
def self.on_preload(&blk)
|
|
(@preload ||= Set.new) << blk
|
|
end
|
|
|
|
def self.preload(bookmarks, object)
|
|
if SiteSetting.use_polymorphic_bookmarks
|
|
preload_polymorphic_associations(bookmarks)
|
|
end
|
|
if @preload
|
|
@preload.each { |preload| preload.call(bookmarks, object) }
|
|
end
|
|
end
|
|
|
|
# These polymorphic associations are loaded to make the UserBookmarkListSerializer's
|
|
# life easier, which conditionally chooses the bookmark serializer to use based
|
|
# on the type, and we want the associations all loaded ahead of time to make
|
|
# sure we are not doing N+1s.
|
|
def self.preload_polymorphic_associations(bookmarks)
|
|
Bookmark.registered_bookmarkables.each do |registered_bookmarkable|
|
|
registered_bookmarkable.perform_preload(bookmarks)
|
|
end
|
|
end
|
|
|
|
def initialize(user:, guardian: nil, params: {})
|
|
@user = user
|
|
@params = params
|
|
@guardian = guardian || Guardian.new(@user)
|
|
@page = @params[:page].to_i
|
|
@limit = @params[:limit].present? ? @params[:limit].to_i : @params[:per_page]
|
|
end
|
|
|
|
def list_all
|
|
return polymorphic_list_all if SiteSetting.use_polymorphic_bookmarks
|
|
|
|
topics = Topic.listable_topics.secured(@guardian)
|
|
pms = Topic.private_messages_for_user(@user)
|
|
results = list_all_results(topics, pms)
|
|
|
|
results = results.order(
|
|
"(CASE WHEN bookmarks.pinned THEN 0 ELSE 1 END),
|
|
bookmarks.reminder_at ASC,
|
|
bookmarks.updated_at DESC"
|
|
)
|
|
|
|
if @params[:q].present?
|
|
results = search(results, @params[:q])
|
|
end
|
|
|
|
if @page.positive?
|
|
results = results.offset(@page * @params[:per_page])
|
|
end
|
|
|
|
results = results.limit(@limit).to_a
|
|
BookmarkQuery.preload(results, self)
|
|
results
|
|
end
|
|
|
|
private
|
|
|
|
def polymorphic_list_all
|
|
search_term = @params[:q]
|
|
ts_query = search_term.present? ? Search.ts_query(term: search_term) : nil
|
|
search_term_wildcard = search_term.present? ? "%#{search_term}%" : nil
|
|
|
|
queries = Bookmark.registered_bookmarkables.map do |bookmarkable|
|
|
interim_results = bookmarkable.perform_list_query(@user, @guardian)
|
|
|
|
if search_term.present?
|
|
interim_results = bookmarkable.perform_search_query(
|
|
interim_results, search_term_wildcard, ts_query
|
|
)
|
|
end
|
|
|
|
# this is purely to make the query easy to read and debug, otherwise it's
|
|
# all mashed up into a massive ball in MiniProfiler :)
|
|
"---- #{bookmarkable.model.to_s} bookmarkable ---\n\n #{interim_results.to_sql}"
|
|
end
|
|
|
|
union_sql = queries.join("\n\nUNION\n\n")
|
|
results = Bookmark.select("bookmarks.*").from("(\n\n#{union_sql}\n\n) as bookmarks")
|
|
results = results.order(
|
|
"(CASE WHEN bookmarks.pinned THEN 0 ELSE 1 END),
|
|
bookmarks.reminder_at ASC,
|
|
bookmarks.updated_at DESC"
|
|
)
|
|
|
|
if @page.positive?
|
|
results = results.offset(@page * @params[:per_page])
|
|
end
|
|
|
|
results = results.limit(@limit).to_a
|
|
BookmarkQuery.preload(results, self)
|
|
results
|
|
end
|
|
|
|
def list_all_results(topics, pms)
|
|
results = base_bookmarks.merge(topics.or(pms))
|
|
results = results.merge(Post.secured(@guardian))
|
|
results = @guardian.filter_allowed_categories(results)
|
|
results
|
|
end
|
|
|
|
def base_bookmarks
|
|
Bookmark.where(user: @user)
|
|
.includes(post: :user)
|
|
.includes(post: { topic: :tags })
|
|
.includes(topic: :topic_users)
|
|
.references(:post)
|
|
.where(topic_users: { user_id: @user.id })
|
|
end
|
|
|
|
def search(results, term)
|
|
bookmark_ts_query = Search.ts_query(term: term)
|
|
results
|
|
.joins("LEFT JOIN post_search_data ON post_search_data.post_id = bookmarks.post_id")
|
|
.where("bookmarks.name ILIKE :q OR #{bookmark_ts_query} @@ post_search_data.search_data", q: "%#{term}%")
|
|
end
|
|
end
|