FIX: Page size edge case for null last_read_message_id (#21811)

Followup 55ef2d0698.

In the cases where the user has no last_read_message_id for
a channel, we want to make sure that a page_size is set for
the ChannelViewBuilder + MessagesQuery, otherwise we end up
loading way more messages than needed (the additional message
loading was fixed in the last commit).
This commit is contained in:
Martin Brennan 2023-05-29 20:12:01 +02:00 committed by GitHub
parent 4ce8ea7496
commit c57ae992b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 0 deletions

View File

@ -84,6 +84,15 @@ module Chat
def determine_target_message_id(contract:, channel:, guardian:, **)
if contract.fetch_from_last_read
contract.target_message_id = channel.membership_for(guardian.user)&.last_read_message_id
# We need to force a page size here because we don't want to
# load all messages in the channel (since starting from 0
# makes them all unread). When the target_message_id is provided
# page size is not required since we load N messages either side of
# the target.
if contract.target_message_id.blank?
contract.page_size = contract.page_size || Chat::MessagesQuery::MAX_PAGE_SIZE
end
end
end

View File

@ -93,6 +93,12 @@ RSpec.describe Chat::ChannelViewBuilder do
it { is_expected.to fail_a_contract }
end
context "when page_size is too big" do
let(:page_size) { Chat::MessagesQuery::MAX_PAGE_SIZE + 1 }
it { is_expected.to fail_a_contract }
end
context "when channel has threading_enabled and enable_experimental_chat_threaded_discussions is true" do
before do
channel.update!(threading_enabled: true)
@ -247,6 +253,19 @@ RSpec.describe Chat::ChannelViewBuilder do
it "does not error and still returns messages" do
expect(subject.view.chat_messages).to eq([past_message_2, past_message_1, message])
end
context "if page_size is nil" do
let(:page_size) { nil }
it "calls the messages query with the default page size" do
::Chat::MessagesQuery
.expects(:call)
.with(has_entries(page_size: Chat::MessagesQuery::MAX_PAGE_SIZE))
.once
.returns({ messages: [] })
subject
end
end
end
end
end