DEV: UserOption.user_tzinfo (#14088)

Provides a safe way to retrieve the timezone of a user.

This is not used in core yet, but used in multiple plugins.
This commit is contained in:
Joffrey JAFFEUX 2021-08-19 21:56:14 +02:00 committed by GitHub
parent e1815a125d
commit 2bbc97fda5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 0 deletions

View File

@ -195,6 +195,20 @@ class UserOption < ActiveRecord::Base
email_messages_level == UserOption.email_level_types[:never]
end
def self.user_tzinfo(user_id)
timezone = UserOption.where(user_id: user_id).pluck(:timezone).first || 'UTC'
tzinfo = nil
begin
tzinfo = ActiveSupport::TimeZone.find_tzinfo(timezone)
rescue TZInfo::InvalidTimezoneIdentifier
Rails.logger.warn("#{User.find_by(id: user_id)&.username} has the timezone #{timezone} set, we do not know how to parse it in Rails, fallback to UTC")
tzinfo = ActiveSupport::TimeZone.find_tzinfo('UTC')
end
tzinfo
end
private
def update_tracked_topics

View File

@ -166,4 +166,28 @@ describe UserOption do
end
end
describe '.user_tzinfo' do
fab!(:user) { Fabricate(:user) }
context 'user with valid timezone given' do
before do
user.user_option.update(timezone: 'Europe/Paris')
end
it 'returns the expect timezone' do
expect(UserOption.user_tzinfo(user.id)).to eq(ActiveSupport::TimeZone.find_tzinfo('Europe/Paris'))
end
end
context 'user with invalid timezone given' do
before do
user.user_option.update(timezone: 'Catopia/Catcity')
end
it 'fallbacks to UTC' do
expect(UserOption.user_tzinfo(user.id)).to eq(ActiveSupport::TimeZone.find_tzinfo('UTC'))
end
end
end
end