#442

backend/spec/requests/post_history_privacy_spec.rb

@@ -37,6 +37,32 @@ RSpec.describe 'Post history privacy', type: :request do
     end
   end
 
+  it 'evaluates each reference condition against the restored snapshot alone' do
+    HistoryAccess.set(user: nil) do
+      restored = PostVersion.where(post_id: post_record.id, version_no: 3)
+      HistoryAccess.reference_sql('post_versions', 'post_versions').each do |condition|
+        expect(restored.where(Arel.sql(condition)).pluck(:version_no)).to eq([3])
+      end
+      expect(HistoryAccess.visible(PostVersion.where(post_id: post_record.id))
+          .pluck(:version_no)).to eq([3])
+    end
+  end
+
+  it 'keeps every version through a later discard private after another restore' do
+    ['discard', 'restore'].each_with_index do |event, index|
+      PostVersion.create!(post: post_record, version_no: index + 5, event_type: event,
+          title: 'later snapshot', url: post_record.url, tags: '', tags_json: [],
+          parent_post_ids: '', created_at: origin + (index + 5).days)
+    end
+
+    get '/posts/versions', params: { post: post_record.id }
+
+    expect(response).to have_http_status(:ok)
+    expect(response.parsed_body.fetch('versions').pluck('version_no')).to eq([6])
+    expect(response.parsed_body.fetch('count')).to eq(1)
+    expect(response.parsed_body.fetch('versions').first.fetch('title').fetch('prev')).to be_nil
+  end
+
   ['anonymous', 'member', 'admin'].each do |role|
     context "as #{ role }" do
       before do
@@ -71,6 +97,15 @@ RSpec.describe 'Post history privacy', type: :request do
         end
       end
 
+      it 'applies authorised timestamp ordering before pagination' do
+        get '/posts', params: { order: 'updated_at:desc', limit: 1 }
+
+        expect(response).to have_http_status(:ok)
+        expected = role == 'admin' ? post_record.id : other_post.id
+        expect(response.parsed_body.fetch('posts').pluck('id')).to eq([expected])
+        expect(response.parsed_body.fetch('count')).to eq(2)
+      end
+
       it 'counts only visible versions and masks a private previous version' do
         get '/posts/versions', params: { post: post_record.id }
         expect(response).to have_http_status(:ok)

backend/spec/requests/posts_spec.rb

@@ -629,6 +629,37 @@ RSpec.describe 'Posts API', type: :request do
         create(:post_tag, post: plain_post, tag:, created_at: t3)
       end
 
+      it 'displays history time after pagination without joining history to posts or count' do
+        queries = []
+        subscriber = ->(event) { queries << event.payload.fetch(:sql) }
+        ActiveSupport::Notifications.subscribed(subscriber, 'sql.active_record') do
+          get '/posts', params: { url: '/version-time/', order: 'url:asc', limit: 1 }
+        end
+
+        expect(response).to have_http_status(:ok)
+        expect(json.fetch('posts').pluck('id')).to eq([history_post.id])
+        expect(Time.zone.parse(json.fetch('posts').first.fetch('updated_at'))).to eq(t2)
+        expect(json.fetch('count')).to eq(3)
+        post_queries = queries.select { _1.include?('FROM `posts`') }
+        expect(post_queries).not_to be_empty
+        expect(post_queries.grep(/post_versions/)).to be_empty
+      end
+
+      it 'omits the history aggregate from count when only sorting by update time' do
+        queries = []
+        subscriber = ->(event) { queries << event.payload.fetch(:sql) }
+        ActiveSupport::Notifications.subscribed(subscriber, 'sql.active_record') do
+          get '/posts', params: { url: '/version-time/', order: 'updated_at:desc', limit: 1 }
+        end
+
+        expect(response).to have_http_status(:ok)
+        expect(json.fetch('posts').pluck('id')).to eq([newer_post.id])
+        expect(json.fetch('count')).to eq(3)
+        count_queries = queries.select { _1.include?('FROM `posts`') && _1.match?(/COUNT\(/i) }
+        expect(count_queries).not_to be_empty
+        expect(count_queries.grep(/post_versions/)).to be_empty
+      end
+
       ['asc', 'desc'].each do |direction|
         it "sorts by the later of post update and latest version time (#{ direction })" do
           get '/posts', params: { url: '/version-time/', order: "updated_at:#{ direction }" }
@@ -658,6 +689,16 @@ RSpec.describe 'Posts API', type: :request do
         expect(json.fetch('posts').map { |item| item.fetch('id') }).to eq([history_post.id])
         expect(json.fetch('count')).to eq(1)
       end
+
+      it 'counts every timestamp match before pagination' do
+        get '/posts', params: { url: '/version-time/', order: 'updated_at:asc',
+                               updated_from: t1.iso8601, updated_to: t3.iso8601,
+                               limit: 1, page: 2 }
+
+        expect(response).to have_http_status(:ok)
+        expect(json.fetch('posts').pluck('id')).to eq([history_post.id])
+        expect(json.fetch('count')).to eq(3)
+      end
     end
 
     context 'when original_created_from/original_created_to are provided' do