From 5f18a3051d3d9c257049eedb4fba4474ffc5c39d Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 25 May 2024 13:36:15 +0200 Subject: [PATCH] Fix interface inconsistencies --- app/helpers/application_helper.rb | 4 ++-- app/jobs/import_job.rb | 2 +- app/services/create_stats.rb | 7 ++++--- app/services/google_maps/semantic_history_parser.rb | 8 +++++--- app/services/own_tracks/export_parser.rb | 8 +++++--- app/views/shared/_right_sidebar.html.erb | 4 ++-- spec/services/create_stats_spec.rb | 13 +++++++------ spec/services/own_tracks/export_parser_spec.rb | 2 +- swagger/v1/swagger.yaml | 2 +- 9 files changed, 28 insertions(+), 22 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 52256b5f..a32fb095 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -53,8 +53,8 @@ module ApplicationHelper DateTime.new(year, month).past? end - def points_exist?(year, month) - Point.where( + def points_exist?(year, month, user) + user.tracked_points.where( timestamp: DateTime.new(year, month).beginning_of_month..DateTime.new(year, month).end_of_month ).exists? end diff --git a/app/jobs/import_job.rb b/app/jobs/import_job.rb index 49e7492a..7c1a9282 100644 --- a/app/jobs/import_job.rb +++ b/app/jobs/import_job.rb @@ -7,7 +7,7 @@ class ImportJob < ApplicationJob user = User.find(user_id) import = user.imports.find(import_id) - result = parser(import.source).new(import).call + result = parser(import.source).new(import, user_id).call import.update( raw_points: result[:raw_points], doubles: result[:doubles], processed: result[:processed] diff --git a/app/services/create_stats.rb b/app/services/create_stats.rb index 4d9c2e8a..24ecb3f2 100644 --- a/app/services/create_stats.rb +++ b/app/services/create_stats.rb @@ -16,7 +16,7 @@ class CreateStats beginning_of_month_timestamp = DateTime.new(year, month).beginning_of_month.to_i end_of_month_timestamp = DateTime.new(year, month).end_of_month.to_i - points = points(beginning_of_month_timestamp, end_of_month_timestamp) + points = points(user, beginning_of_month_timestamp, end_of_month_timestamp) next if points.empty? stat = Stat.find_or_initialize_by(year:, month:, user:) @@ -31,8 +31,9 @@ class CreateStats private - def points(beginning_of_month_timestamp, end_of_month_timestamp) - Point + def points(user, beginning_of_month_timestamp, end_of_month_timestamp) + user + .tracked_points .without_raw_data .where(timestamp: beginning_of_month_timestamp..end_of_month_timestamp) .order(:timestamp) diff --git a/app/services/google_maps/semantic_history_parser.rb b/app/services/google_maps/semantic_history_parser.rb index eb4ecb58..6129cd4a 100644 --- a/app/services/google_maps/semantic_history_parser.rb +++ b/app/services/google_maps/semantic_history_parser.rb @@ -1,10 +1,11 @@ # frozen_string_literal: true class GoogleMaps::SemanticHistoryParser - attr_reader :import + attr_reader :import, :user_id - def initialize(import) + def initialize(import, user_id) @import = import + @user_id = user_id end def call @@ -22,7 +23,8 @@ class GoogleMaps::SemanticHistoryParser raw_data: point_data[:raw_data], topic: 'Google Maps Timeline Export', tracker_id: 'google-maps-timeline-export', - import_id: import.id + import_id: import.id, + user_id: ) points += 1 diff --git a/app/services/own_tracks/export_parser.rb b/app/services/own_tracks/export_parser.rb index 9e03bb74..c9b64029 100644 --- a/app/services/own_tracks/export_parser.rb +++ b/app/services/own_tracks/export_parser.rb @@ -1,11 +1,12 @@ # frozen_string_literal: true class OwnTracks::ExportParser - attr_reader :import, :json + attr_reader :import, :json, :user_id - def initialize(import) + def initialize(import, user_id) @import = import @json = import.raw_data + @user_id = user_id end def call @@ -23,7 +24,8 @@ class OwnTracks::ExportParser raw_data: point_data[:raw_data], topic: point_data[:topic], tracker_id: point_data[:tracker_id], - import_id: import.id + import_id: import.id, + user_id: ) points += 1 diff --git a/app/views/shared/_right_sidebar.html.erb b/app/views/shared/_right_sidebar.html.erb index 9c599d00..e5d27f07 100644 --- a/app/views/shared/_right_sidebar.html.erb +++ b/app/views/shared/_right_sidebar.html.erb @@ -4,7 +4,7 @@
Select year
@@ -18,7 +18,7 @@
<% (1..12).to_a.each_slice(3) do |months| %> <% months.each do |month_number| %> - <% if past?(year, month_number) && points_exist?(year, month_number) %> + <% if past?(year, month_number) && points_exist?(year, month_number, current_user) %> <%= link_to Date::ABBR_MONTHNAMES[month_number], map_url(timespan(month_number, year)), class: 'btn btn-default' %> <% else %>
<%= Date::ABBR_MONTHNAMES[month_number] %>
diff --git a/spec/services/create_stats_spec.rb b/spec/services/create_stats_spec.rb index 271116b5..ddfee1da 100644 --- a/spec/services/create_stats_spec.rb +++ b/spec/services/create_stats_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe CreateStats do @@ -9,16 +11,15 @@ RSpec.describe CreateStats do context 'when there are no points' do it 'does not create stats' do - expect { create_stats }.not_to change { Stat.count } + expect { create_stats }.not_to(change { Stat.count }) end end context 'when there are points' do - let!(:import) { create(:import, user: user) } - let!(:point_1) { create(:point, import: import, latitude: 0, longitude: 0) } - let!(:point_2) { create(:point, import: import, latitude: 1, longitude: 2) } - let!(:point_3) { create(:point, import: import, latitude: 3, longitude: 4) } - + let!(:import) { create(:import, user:) } + let!(:point1) { create(:point, user:, import:, latitude: 0, longitude: 0) } + let!(:point2) { create(:point, user:, import:, latitude: 1, longitude: 2) } + let!(:point3) { create(:point, user:, import:, latitude: 3, longitude: 4) } it 'creates stats' do expect { create_stats }.to change { Stat.count }.by(1) diff --git a/spec/services/own_tracks/export_parser_spec.rb b/spec/services/own_tracks/export_parser_spec.rb index a71614a3..bd8d525e 100644 --- a/spec/services/own_tracks/export_parser_spec.rb +++ b/spec/services/own_tracks/export_parser_spec.rb @@ -4,7 +4,7 @@ require 'rails_helper' RSpec.describe OwnTracks::ExportParser do describe '#call' do - subject(:parser) { described_class.new(import).call } + subject(:parser) { described_class.new(import, user.id).call } let(:user) { create(:user) } let(:import) { create(:import, user:, name: 'owntracks_export.json') } diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml index 718e55fe..4e2f3daa 100644 --- a/swagger/v1/swagger.yaml +++ b/swagger/v1/swagger.yaml @@ -180,7 +180,7 @@ paths: lat: 52.502397 lon: 13.356718 tid: Swagger - tst: 1716636414 + tst: 1716636973 servers: - url: http://{defaultHost} variables: