IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Improved performance of report spec (#8642)

Browse Source 
* FIX: bulk insert to create application requests
* FIX: bulk insert to create topics
* FIX: no need to create separate user for each topic, post etc.
* FIX: Another bulk_insert of ApplicationRequests
* FIX: dont create user and topic instances when not neccessary
* FIX: merge examples with expensive setup into one example
This commit is contained in:
Krzysztof Kotlarek 2020-01-06 17:17:07 +11:00 committed by Sam
parent e0da8d3ce6
commit afff96ce54
1 changed files with 95 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
spec/models/report_spec.rb
View File

@ -3,9 +3,10 @@
require 'rails_helper'
describe Report do
let(:c0) { Fabricate(:category) } # id: 3
let(:c1) { Fabricate(:category, parent_category: c0) } # id: 2
let(:c2) { Fabricate(:category) } # id: 4
let(:user) { Fabricate(:user) } # id: 3
let(:c0) { Fabricate(:category, user: user) } # id: 3
let(:c1) { Fabricate(:category, parent_category: c0, user: user) } # id: 2
let(:c2) { Fabricate(:category, user: user) } # id: 4
shared_examples 'no data' do
context "with no data" do
@ -51,15 +52,17 @@ describe Report do
freeze_time DateTime.parse('2017-03-01 12:00')
# today, an incomplete day:
ApplicationRequest.create(date: 0.days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 1)
application_requests = [{ date: 0.days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 1 }]
# 60 complete days:
30.times do |i|
ApplicationRequest.create(date: (i + 1).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 10)
30.times.each_with_object(application_requests) do |i|
application_requests.concat([{ date: (i + 1).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 10 }])
end
30.times do |i|
ApplicationRequest.create(date: (31 + i).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 100)
30.times.each_with_object(application_requests) do |i|
application_requests.concat([{ date: (31 + i).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 100 }])
end
ApplicationRequest.insert_all(application_requests)
end
subject(:json) { Report.find("http_total_reqs").as_json }
@ -75,10 +78,20 @@ describe Report do
before do
Report.clear_cache
freeze_time DateTime.parse('2017-03-01 12:00')
((0..32).to_a + [60, 61, 62, 63]).each do |i|
Fabricate(:topic, created_at: i.days.ago)
user = Fabricate(:user)
topics = ((0..32).to_a + [60, 61, 62, 63]).map do |i|
date = i.days.ago
{
user_id: user.id,
last_post_user_id: user.id,
title: "topic #{i}",
category_id: SiteSetting.uncategorized_category_id,
bumped_at: date,
created_at: date,
updated_at: date
}
end
Topic.insert_all(topics)
end
it "counts the correct records" do
@ -121,7 +134,6 @@ describe Report do
expect(report.data.select { |v| v[:x].today? }).to be_present
expect(report.prev30Days).to eq(2)
end
end
end
@ -166,24 +178,22 @@ describe Report do
if arg == :flag
user = Fabricate(:user)
builder = -> (dt) { PostActionCreator.create(user, Fabricate(:post), :spam, created_at: dt) }
topic = Fabricate(:topic, user: user)
builder = -> (dt) { PostActionCreator.create(user, Fabricate(:post, topic: topic, user: user), :spam, created_at: dt) }
elsif arg == :signup
builder = -> (dt) { Fabricate(:user, created_at: dt) }
else
factories = { signup: :user, email: :email_log }
builder = -> (dt) { Fabricate(factories[arg] || arg, created_at: dt) }
user = Fabricate(:user)
factories = { email: :email_log }
builder = -> (dt) { Fabricate(factories[arg] || arg, created_at: dt, user: user) }
end
[DateTime.now, 1.hour.ago, 1.hour.ago, 1.day.ago, 2.days.ago, 30.days.ago, 35.days.ago].each(&builder)
end
it "returns today's data" do
it "returns today's, total and previous 30 day's data" do
expect(report.data.select { |v| v[:x].today? }).to be_present
end
it 'returns total data' do
expect(report.total).to eq 7
end
it "returns previous 30 day's data" do
expect(report.prev30Days).to be_present
end
end
@ -203,47 +213,47 @@ describe Report do
context "with #{request_type}" do
before(:each) do
freeze_time DateTime.parse('2017-03-01 12:00')
ApplicationRequest.create(date: 35.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 35)
ApplicationRequest.create(date: 7.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 8)
ApplicationRequest.create(date: Time.now, req_type: ApplicationRequest.req_types[request_type.to_s], count: 1)
ApplicationRequest.create(date: 1.day.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 2)
ApplicationRequest.create(date: 2.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 3)
application_requests = [
{ date: 35.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 35 },
{ date: 7.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 8 },
{ date: Time.now, req_type: ApplicationRequest.req_types[request_type.to_s], count: 1 },
{ date: 1.day.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 2 },
{ date: 2.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 3 }
]
ApplicationRequest.insert_all(application_requests)
end
context 'returns a report with data' do
it "returns expected number of recoords" do
it 'returns a report with data' do
# expected number of recoords
expect(report.data.count).to eq 4
end
it 'sorts the data from oldest to latest dates' do
# sorts the data from oldest to latest dates
expect(report.data[0][:y]).to eq(8) # 7 days ago
expect(report.data[1][:y]).to eq(3) # 2 days ago
expect(report.data[2][:y]).to eq(2) # 1 day ago
expect(report.data[3][:y]).to eq(1) # today
end
it "returns today's data" do
expect(report.data.select { |value| value[:x] == Date.today }).to be_present
end
# today's data
expect(report.data.find { |value| value[:x] == Date.today }).to be_present
it 'returns total data' do
# total data
expect(report.total).to eq 49
end
it 'returns previous 30 days of data' do
#previous 30 days of data
expect(report.prev30Days).to eq 35
end
end
end
end
end
describe 'user to user private messages with replies' do
let(:report) { Report.find('user_to_user_private_messages_with_replies') }
let(:user) { Fabricate(:user) }
let(:topic) { Fabricate(:topic, created_at: 1.hour.ago, user: user) }
it 'topic report).to not include private messages' do
Fabricate(:private_message_topic, created_at: 1.hour.ago)
Fabricate(:topic, created_at: 1.hour.ago)
Fabricate(:private_message_topic, created_at: 1.hour.ago, user: user)
topic
report = Report.find('topics')
expect(report.data[0][:y]).to eq(1)
expect(report.total).to eq(1)
@ -264,7 +274,7 @@ describe Report do
context 'some public posts' do
it 'returns an empty report' do
Fabricate(:post); Fabricate(:post)
Fabricate(:post, topic: topic, user: user); Fabricate(:post, topic: topic, user: user)
expect(report.data).to be_blank
expect(report.total).to eq 0
end
@ -273,9 +283,9 @@ describe Report do
context 'some private messages' do
before do
Fabricate(:private_message_post, created_at: 25.hours.ago)
Fabricate(:private_message_post, created_at: 1.hour.ago)
Fabricate(:private_message_post, created_at: 1.hour.ago)
Fabricate(:private_message_post, created_at: 25.hours.ago, user: user)
Fabricate(:private_message_post, created_at: 1.hour.ago, user: user)
Fabricate(:private_message_post, created_at: 1.hour.ago, user: user)
end
it 'returns correct data' do
@ -286,7 +296,8 @@ describe Report do
context 'and some public posts' do
before do
Fabricate(:post); Fabricate(:post)
Fabricate(:post, user: user, topic: topic)
Fabricate(:post, user: user, topic: topic)
end
it 'returns correct data' do
@ -505,7 +516,7 @@ describe Report do
context "with flags" do
let(:flagger) { Fabricate(:user) }
let(:post) { Fabricate(:post) }
let(:post) { Fabricate(:post, user: flagger) }
before do
freeze_time
@ -683,7 +694,6 @@ describe Report do
context "private messages" do
before do
Fabricate(:post, user: sam)
Fabricate(:topic, user: sam)
Fabricate(:post, user: jeff)
Fabricate(:private_message_post, user: jeff)
end
@ -744,10 +754,11 @@ describe Report do
before(:each) do
user = Fabricate(:user)
post0 = Fabricate(:post)
post1 = Fabricate(:post, topic: Fabricate(:topic, category: c1))
post2 = Fabricate(:post)
post3 = Fabricate(:post)
topic = Fabricate(:topic, user: user)
post0 = Fabricate(:post, topic: topic, user: user)
post1 = Fabricate(:post, topic: Fabricate(:topic, category: c1, user: user), user: user)
post2 = Fabricate(:post, topic: topic, user: user)
post3 = Fabricate(:post, topic: topic, user: user)
PostActionCreator.off_topic(user, post0)
PostActionCreator.off_topic(user, post1)
PostActionCreator.off_topic(user, post2)
@ -777,10 +788,11 @@ describe Report do
include_examples 'with data x/y'
before(:each) do
Fabricate(:topic)
Fabricate(:topic, category: c1)
Fabricate(:topic)
Fabricate(:topic, created_at: 45.days.ago)
user = Fabricate(:user)
Fabricate(:topic, user: user)
Fabricate(:topic, category: c1, user: user)
Fabricate(:topic, user: user)
Fabricate(:topic, created_at: 45.days.ago, user: user)
end
context "with category filtering" do
@ -865,12 +877,13 @@ describe Report do
include_examples 'with data x/y'
before(:each) do
topic = Fabricate(:topic)
topic_with_category_id = Fabricate(:topic, category: c1)
Fabricate(:post, topic: topic)
Fabricate(:post, topic: topic_with_category_id)
Fabricate(:post, topic: topic)
Fabricate(:post, created_at: 45.days.ago, topic: topic)
user = Fabricate(:user)
topic = Fabricate(:topic, user: user)
topic_with_category_id = Fabricate(:topic, category: c1, user: user)
Fabricate(:post, topic: topic, user: user)
Fabricate(:post, topic: topic_with_category_id, user: user)
Fabricate(:post, topic: topic, user: user)
Fabricate(:post, created_at: 45.days.ago, topic: topic, user: user)
end
context "with category filtering" do
@ -898,10 +911,11 @@ describe Report do
include_examples 'with data x/y'
before(:each) do
Fabricate(:topic, category: c1)
Fabricate(:post, topic: Fabricate(:topic))
Fabricate(:topic)
Fabricate(:topic, created_at: 45.days.ago)
user = Fabricate(:user)
Fabricate(:topic, category: c1, user: user)
Fabricate(:post, topic: Fabricate(:topic, user: user), user: user)
Fabricate(:topic, user: user)
Fabricate(:topic, created_at: 45.days.ago, user: user)
end
context "with category filtering" do
@ -958,21 +972,23 @@ describe Report do
let(:joffrey) { Fabricate(:user, username: "joffrey") }
let(:robin) { Fabricate(:user, username: "robin") }
let(:moderator) { Fabricate(:moderator) }
let(:user) { Fabricate(:user) }
context 'with data' do
it "it works" do
10.times do
post_disagreed = Fabricate(:post)
topic = Fabricate(:topic, user: user)
2.times do
post_disagreed = Fabricate(:post, topic: topic, user: user)
result = PostActionCreator.spam(joffrey, post_disagreed)
result.reviewable.perform(moderator, :disagree)
end
3.times do
post_disagreed = Fabricate(:post)
post_disagreed = Fabricate(:post, topic: topic, user: user)
result = PostActionCreator.spam(robin, post_disagreed)
result.reviewable.perform(moderator, :disagree)
end
post_agreed = Fabricate(:post)
post_agreed = Fabricate(:post, user: user, topic: topic)
result = PostActionCreator.off_topic(robin, post_agreed)
result.reviewable.perform(moderator, :agree_and_keep)
@ -980,9 +996,9 @@ describe Report do
first = report.data[0]
expect(first[:username]).to eq("joffrey")
expect(first[:score]).to eq(10)
expect(first[:score]).to eq(2)
expect(first[:agreed_flags]).to eq(0)
expect(first[:disagreed_flags]).to eq(10)
expect(first[:disagreed_flags]).to eq(2)
second = report.data[1]
expect(second[:username]).to eq("robin")