chore: Timezone fixes for ReportBuilder and for ReportController spec (#4246)

- ReportBuilder wasn't using the specified time zone for the timestamp in the
"build" method
- The ReportController spec was calling `Time.zone.today.to_time`, but
`Date#to_time` disregards the zone from `Time.zone` and reverts to the system
time zone.
This commit is contained in:
Jordan Brough
2022-03-25 02:30:27 -06:00
committed by GitHub
parent 6bfe0f2fc1
commit a8cfcbc168
2 changed files with 43 additions and 29 deletions

View File

@@ -19,7 +19,7 @@ class V2::ReportBuilder
# For backward compatible with old report # For backward compatible with old report
def build def build
timeseries.each_with_object([]) do |p, arr| timeseries.each_with_object([]) do |p, arr|
arr << { value: p[1], timestamp: p[0].to_time.to_i } arr << { value: p[1], timestamp: p[0].in_time_zone(@timezone).to_i }
end end
end end

View File

@@ -7,6 +7,8 @@ RSpec.describe 'Reports API', type: :request do
let!(:user) { create(:user, account: account) } let!(:user) { create(:user, account: account) }
let!(:inbox) { create(:inbox, account: account) } let!(:inbox) { create(:inbox, account: account) }
let(:inbox_member) { create(:inbox_member, user: user, inbox: inbox) } let(:inbox_member) { create(:inbox_member, user: user, inbox: inbox) }
let(:date_timestamp) { Time.current.beginning_of_day.to_i }
let(:params) { { timezone_offset: Time.zone.utc_offset } }
before do before do
create_list(:conversation, 10, account: account, inbox: inbox, create_list(:conversation, 10, account: account, inbox: inbox,
@@ -23,12 +25,14 @@ RSpec.describe 'Reports API', type: :request do
end end
context 'when it is an authenticated user' do context 'when it is an authenticated user' do
params = { let(:params) do
metric: 'conversations_count', super().merge(
type: :account, metric: 'conversations_count',
since: Time.zone.today.to_time.to_i.to_s, type: :account,
until: Time.zone.today.to_time.to_i.to_s since: date_timestamp.to_s,
} until: date_timestamp.to_s
)
end
it 'returns unauthorized for agents' do it 'returns unauthorized for agents' do
get "/api/v2/accounts/#{account.id}/reports", get "/api/v2/accounts/#{account.id}/reports",
@@ -48,7 +52,7 @@ RSpec.describe 'Reports API', type: :request do
expect(response).to have_http_status(:success) expect(response).to have_http_status(:success)
json_response = JSON.parse(response.body) json_response = JSON.parse(response.body)
current_day_metric = json_response.select { |x| x['timestamp'] == Time.zone.today.to_time.to_i } current_day_metric = json_response.select { |x| x['timestamp'] == date_timestamp }
expect(current_day_metric.length).to eq(1) expect(current_day_metric.length).to eq(1)
expect(current_day_metric[0]['value']).to eq(10) expect(current_day_metric[0]['value']).to eq(10)
end end
@@ -65,11 +69,13 @@ RSpec.describe 'Reports API', type: :request do
end end
context 'when it is an authenticated user' do context 'when it is an authenticated user' do
params = { let(:params) do
type: :account, super().merge(
since: Time.zone.today.to_time.to_i.to_s, type: :account,
until: Time.zone.today.to_time.to_i.to_s since: date_timestamp.to_s,
} until: date_timestamp.to_s
)
end
it 'returns unauthorized for agents' do it 'returns unauthorized for agents' do
get "/api/v2/accounts/#{account.id}/reports/summary", get "/api/v2/accounts/#{account.id}/reports/summary",
@@ -104,10 +110,12 @@ RSpec.describe 'Reports API', type: :request do
end end
context 'when it is an authenticated user' do context 'when it is an authenticated user' do
params = { let(:params) do
since: 30.days.ago.to_i.to_s, super().merge(
until: Time.zone.today.to_time.to_i.to_s since: 30.days.ago.to_i.to_s,
} until: date_timestamp.to_s
)
end
it 'returns unauthorized for agents' do it 'returns unauthorized for agents' do
get "/api/v2/accounts/#{account.id}/reports/agents.csv", get "/api/v2/accounts/#{account.id}/reports/agents.csv",
@@ -137,10 +145,12 @@ RSpec.describe 'Reports API', type: :request do
end end
context 'when it is an authenticated user' do context 'when it is an authenticated user' do
params = { let(:params) do
since: 30.days.ago.to_i.to_s, super().merge(
until: Time.zone.today.to_time.to_i.to_s since: 30.days.ago.to_i.to_s,
} until: date_timestamp.to_s
)
end
it 'returns unauthorized for inboxes' do it 'returns unauthorized for inboxes' do
get "/api/v2/accounts/#{account.id}/reports/inboxes", get "/api/v2/accounts/#{account.id}/reports/inboxes",
@@ -170,10 +180,12 @@ RSpec.describe 'Reports API', type: :request do
end end
context 'when it is an authenticated user' do context 'when it is an authenticated user' do
params = { let(:params) do
since: 30.days.ago.to_i.to_s, super().merge(
until: Time.zone.today.to_time.to_i.to_s since: 30.days.ago.to_i.to_s,
} until: date_timestamp.to_s
)
end
it 'returns unauthorized for labels' do it 'returns unauthorized for labels' do
get "/api/v2/accounts/#{account.id}/reports/labels.csv", get "/api/v2/accounts/#{account.id}/reports/labels.csv",
@@ -203,10 +215,12 @@ RSpec.describe 'Reports API', type: :request do
end end
context 'when it is an authenticated user' do context 'when it is an authenticated user' do
params = { let(:params) do
since: 30.days.ago.to_i.to_s, super().merge(
until: Time.zone.today.to_time.to_i.to_s since: 30.days.ago.to_i.to_s,
} until: date_timestamp.to_s
)
end
it 'returns unauthorized for teams' do it 'returns unauthorized for teams' do
get "/api/v2/accounts/#{account.id}/reports/teams.csv", get "/api/v2/accounts/#{account.id}/reports/teams.csv",