kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-11 01:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix potential issue with time range data types

Browse source
This commit is contained in:
Eugene Burmakin 2025-07-17 20:20:14 +02:00
parent 1f5325d9bb
commit f5ef2ab9ef
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/services/tracks/generator.rb
View file

@ -73,7 +73,7 @@ class Tracks::Generator
def load_bulk_points
scope = user.tracked_points.order(:timestamp)
scope = scope.where(timestamp: time_range) if time_range_defined?
scope = scope.where(timestamp: timestamp_range) if time_range_defined?
scope
end
@ -109,7 +109,31 @@ class Tracks::Generator
def time_range
return nil unless time_range_defined?
Time.at(start_at&.to_i)..Time.at(end_at&.to_i)
start_time = start_at&.to_i
end_time = end_at&.to_i
if start_time && end_time
Time.zone.at(start_time)..Time.zone.at(end_time)
elsif start_time
Time.zone.at(start_time)..
elsif end_time
..Time.zone.at(end_time)
end
end
def timestamp_range
return nil unless time_range_defined?
start_time = start_at&.to_i
end_time = end_at&.to_i
if start_time && end_time
start_time..end_time
elsif start_time
start_time..
elsif end_time
..end_time
end
end
def daily_time_range