diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 6ce83808..b51c3ea7 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -5,6 +5,9 @@ class StatsController < ApplicationController def index @stats = current_user.stats.group_by(&:year).sort.reverse + @points_total = current_user.tracked_points.count + @points_reverse_geocoded = current_user.total_reverse_geocoded_points + @points_reverse_geocoded_without_data = current_user.total_reverse_geocoded_points_without_data end def show diff --git a/app/controllers/visits_controller.rb b/app/controllers/visits_controller.rb index 19433fd1..cde2c8fd 100644 --- a/app/controllers/visits_controller.rb +++ b/app/controllers/visits_controller.rb @@ -11,6 +11,7 @@ class VisitsController < ApplicationController visits = current_user .visits .where(status:) + .includes(%i[suggested_places area]) .order(started_at: order_by) .group_by { |visit| visit.started_at.to_date } .map { |k, v| { date: k, visits: v } } diff --git a/app/models/point.rb b/app/models/point.rb index c4b00d14..bec501b4 100644 --- a/app/models/point.rb +++ b/app/models/point.rb @@ -17,8 +17,8 @@ class Point < ApplicationRecord }, suffix: true enum :connection, { mobile: 0, wifi: 1, offline: 2, unknown: 4 }, suffix: true - scope :reverse_geocoded, -> { where.not(geodata: {}) } - scope :not_reverse_geocoded, -> { where(geodata: {}) } + scope :reverse_geocoded, -> { where.not(reverse_geocoded_at: nil) } + scope :not_reverse_geocoded, -> { where(reverse_geocoded_at: nil) } scope :visited, -> { where.not(visit_id: nil) } scope :not_visited, -> { where(visit_id: nil) } @@ -39,6 +39,10 @@ class Point < ApplicationRecord ReverseGeocodingJob.perform_later(self.class.to_s, id) end + def reverse_geocoded? + reverse_geocoded_at.present? + end + private def broadcast_coordinates diff --git a/app/models/user.rb b/app/models/user.rb index a102d0b5..9eddffa8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -49,8 +49,12 @@ class User < ApplicationRecord cities_visited.size end - def total_reverse_geocoded - tracked_points.select(:id).where.not(geodata: {}).count + def total_reverse_geocoded_points + tracked_points.where.not(reverse_geocoded_at: nil).count + end + + def total_reverse_geocoded_points_without_data + tracked_points.where(geodata: {}).count end private diff --git a/app/services/reverse_geocoding/points/fetch_data.rb b/app/services/reverse_geocoding/points/fetch_data.rb index ea322044..98b1dab4 100644 --- a/app/services/reverse_geocoding/points/fetch_data.rb +++ b/app/services/reverse_geocoding/points/fetch_data.rb @@ -10,17 +10,16 @@ class ReverseGeocoding::Points::FetchData end def call - return if reverse_geocoded? + return if point.reverse_geocoded? response = Geocoder.search([point.latitude, point.longitude]).first return if response.blank? || response.data['error'].present? - point.update!(city: response.city, country: response.country, geodata: response.data) - end - - private - - def reverse_geocoded? - point.geodata.present? + point.update!( + city: response.city, + country: response.country, + geodata: response.data, + reverse_geocoded_at: Time.current + ) end end diff --git a/app/views/stats/_reverse_geocoding_stats.html.erb b/app/views/stats/_reverse_geocoding_stats.html.erb index 8bdbde05..d7fb145e 100644 --- a/app/views/stats/_reverse_geocoding_stats.html.erb +++ b/app/views/stats/_reverse_geocoding_stats.html.erb @@ -1,8 +1,13 @@
- <%= number_with_delimiter current_user.total_reverse_geocoded %> + <%= number_with_delimiter @points_reverse_geocoded %>
Reverse geocoded points
+
+ + <%= number_with_delimiter @points_reverse_geocoded_without_data %> points without data + +
diff --git a/app/views/stats/index.html.erb b/app/views/stats/index.html.erb index 34911306..ee3b33cd 100644 --- a/app/views/stats/index.html.erb +++ b/app/views/stats/index.html.erb @@ -11,7 +11,7 @@
- <%= number_with_delimiter current_user.tracked_points.count %> + <%= number_with_delimiter @points_total %>
Geopoints tracked
diff --git a/config/environments/test.rb b/config/environments/test.rb index 0dda9f9f..3b958189 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,4 @@ -require "active_support/core_ext/integer/time" +require 'active_support/core_ext/integer/time' # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that @@ -15,12 +15,12 @@ Rails.application.configure do # this is usually not necessary, and can slow down your test suite. However, it's # recommended that you enable it in continuous integration systems to ensure eager # loading is working properly before deploying your code. - config.eager_load = ENV["CI"].present? + config.eager_load = ENV['CI'].present? # Configure public file server for tests with Cache-Control for performance. config.public_file_server.enabled = true config.public_file_server.headers = { - "Cache-Control" => "public, max-age=#{1.hour.to_i}" + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" } # Show full error reports and disable caching. diff --git a/db/data/20241202125248_set_reverse_geocoded_at_for_points.rb b/db/data/20241202125248_set_reverse_geocoded_at_for_points.rb new file mode 100644 index 00000000..289380cf --- /dev/null +++ b/db/data/20241202125248_set_reverse_geocoded_at_for_points.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class SetReverseGeocodedAtForPoints < ActiveRecord::Migration[7.2] + def up + # rubocop:disable Rails/SkipsModelValidations + Point.where.not(geodata: {}).update_all(reverse_geocoded_at: Time.current) + # rubocop:enable Rails/SkipsModelValidations + end + + def down + raise ActiveRecord::IrreversibleMigration + end +end diff --git a/db/migrate/20241202114820_add_reverse_geocoded_at_to_points.rb b/db/migrate/20241202114820_add_reverse_geocoded_at_to_points.rb new file mode 100644 index 00000000..357849b5 --- /dev/null +++ b/db/migrate/20241202114820_add_reverse_geocoded_at_to_points.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddReverseGeocodedAtToPoints < ActiveRecord::Migration[7.2] + disable_ddl_transaction! + + def change + add_column :points, :reverse_geocoded_at, :datetime + + add_index :points, :reverse_geocoded_at, algorithm: :concurrently + end +end diff --git a/db/schema.rb b/db/schema.rb index 3e1a538f..1c5c6e49 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.2].define(version: 2024_11_28_095325) do +ActiveRecord::Schema[7.2].define(version: 2024_12_02_114820) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -155,6 +155,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_11_28_095325) do t.bigint "user_id" t.jsonb "geodata", default: {}, null: false t.bigint "visit_id" + t.datetime "reverse_geocoded_at" t.index ["altitude"], name: "index_points_on_altitude" t.index ["battery"], name: "index_points_on_battery" t.index ["battery_status"], name: "index_points_on_battery_status" @@ -164,6 +165,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_11_28_095325) do t.index ["geodata"], name: "index_points_on_geodata", using: :gin t.index ["import_id"], name: "index_points_on_import_id" t.index ["latitude", "longitude"], name: "index_points_on_latitude_and_longitude" + t.index ["reverse_geocoded_at"], name: "index_points_on_reverse_geocoded_at" t.index ["timestamp"], name: "index_points_on_timestamp" t.index ["trigger"], name: "index_points_on_trigger" t.index ["user_id"], name: "index_points_on_user_id" diff --git a/spec/factories/points.rb b/spec/factories/points.rb index 86e76319..6ae12ab2 100644 --- a/spec/factories/points.rb +++ b/spec/factories/points.rb @@ -54,11 +54,12 @@ FactoryBot.define do } } end + end - trait :reverse_geocoded do - country { FFaker::Address.country } - city { FFaker::Address.city } - end + trait :reverse_geocoded do + country { FFaker::Address.country } + city { FFaker::Address.city } + reverse_geocoded_at { Time.current } end end end diff --git a/spec/fixtures/files/geojson/export_same_points.json b/spec/fixtures/files/geojson/export_same_points.json index 2ecfb883..7a20a47f 100644 --- a/spec/fixtures/files/geojson/export_same_points.json +++ b/spec/fixtures/files/geojson/export_same_points.json @@ -1 +1 @@ -{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{}}}]} +{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}}]} diff --git a/spec/models/point_spec.rb b/spec/models/point_spec.rb index 5278846b..12e2442a 100644 --- a/spec/models/point_spec.rb +++ b/spec/models/point_spec.rb @@ -16,7 +16,7 @@ RSpec.describe Point, type: :model do describe 'scopes' do describe '.reverse_geocoded' do - let(:point) { create(:point, :with_geodata) } + let(:point) { create(:point, :reverse_geocoded) } let(:point_without_address) { create(:point, city: nil, country: nil) } it 'returns points with reverse geocoded address' do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index c42d969f..c98325dd 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -92,17 +92,26 @@ RSpec.describe User, type: :model do end end - describe '#total_reverse_geocoded' do - subject { user.total_reverse_geocoded } + describe '#total_reverse_geocoded_points' do + subject { user.total_reverse_geocoded_points } - let!(:reverse_geocoded_point) do - create(:point, country: 'Country', city: 'City', geodata: { some: 'data' }, user:) - end - let!(:not_reverse_geocoded_point) { create(:point, country: 'Country', city: 'City', user:) } + let!(:reverse_geocoded_point) { create(:point, :reverse_geocoded, user:) } + let!(:not_reverse_geocoded_point) { create(:point, user:, reverse_geocoded_at: nil) } it 'returns number of reverse geocoded points' do expect(subject).to eq(1) end end + + describe '#total_reverse_geocoded_points_without_data' do + subject { user.total_reverse_geocoded_points_without_data } + + let!(:reverse_geocoded_point) { create(:point, :reverse_geocoded, :with_geodata, user:) } + let!(:reverse_geocoded_point_without_data) { create(:point, :reverse_geocoded, user:, geodata: {}) } + + it 'returns number of reverse geocoded points without data' do + expect(subject).to eq(1) + end + end end end diff --git a/spec/requests/api/v1/stats_spec.rb b/spec/requests/api/v1/stats_spec.rb index 1f04d263..d733ae3f 100644 --- a/spec/requests/api/v1/stats_spec.rb +++ b/spec/requests/api/v1/stats_spec.rb @@ -9,7 +9,9 @@ RSpec.describe 'Api::V1::Stats', type: :request do let!(:user) { create(:user) } let!(:stats_in_2020) { create_list(:stat, 12, year: 2020, user:) } let!(:stats_in_2021) { create_list(:stat, 12, year: 2021, user:) } - let!(:points_in_2020) { create_list(:point, 85, :with_geodata, timestamp: Time.zone.local(2020), user:) } + let!(:points_in_2020) do + create_list(:point, 85, :with_geodata, :reverse_geocoded, timestamp: Time.zone.local(2020), user:) + end let!(:points_in_2021) { create_list(:point, 95, timestamp: Time.zone.local(2021), user:) } let(:expected_json) do { diff --git a/spec/serializers/stats_serializer_spec.rb b/spec/serializers/stats_serializer_spec.rb index 7c2c1261..ad6f5bc8 100644 --- a/spec/serializers/stats_serializer_spec.rb +++ b/spec/serializers/stats_serializer_spec.rb @@ -28,8 +28,12 @@ RSpec.describe StatsSerializer do context 'when the user has stats' do let!(:stats_in_2020) { create_list(:stat, 12, year: 2020, user:) } let!(:stats_in_2021) { create_list(:stat, 12, year: 2021, user:) } - let!(:points_in_2020) { create_list(:point, 85, :with_geodata, timestamp: Time.zone.local(2020), user:) } - let!(:points_in_2021) { create_list(:point, 95, timestamp: Time.zone.local(2021), user:) } + let!(:points_in_2020) do + create_list(:point, 85, :with_geodata, :reverse_geocoded, timestamp: Time.zone.local(2020), user:) + end + let!(:points_in_2021) do + create_list(:point, 95, timestamp: Time.zone.local(2021), user:) + end let(:expected_json) do { "totalDistanceKm": stats_in_2020.map(&:distance).sum + stats_in_2021.map(&:distance).sum, diff --git a/spec/services/exports/create_spec.rb b/spec/services/exports/create_spec.rb index f016a024..e20e2d41 100644 --- a/spec/services/exports/create_spec.rb +++ b/spec/services/exports/create_spec.rb @@ -13,8 +13,13 @@ RSpec.describe Exports::Create do let(:export_name) { "#{start_at.to_date}_#{end_at.to_date}" } let(:export) { create(:export, user:, name: export_name, status: :created) } let(:export_content) { Points::GeojsonSerializer.new(points).call } + let(:reverse_geocoded_at) { Time.zone.local(2021, 1, 1) } let!(:points) do - create_list(:point, 10, :with_known_location, user:, timestamp: start_at.to_datetime.to_i) + create_list(:point, 10, :with_known_location, user:, timestamp: start_at.to_datetime.to_i, reverse_geocoded_at:) + end + + before do + allow_any_instance_of(Point).to receive(:reverse_geocoded_at).and_return(reverse_geocoded_at) end it 'writes the data to a file' do diff --git a/spec/services/reverse_geocoding/points/fetch_data_spec.rb b/spec/services/reverse_geocoding/points/fetch_data_spec.rb index 280bf161..a33ab054 100644 --- a/spec/services/reverse_geocoding/points/fetch_data_spec.rb +++ b/spec/services/reverse_geocoding/points/fetch_data_spec.rb @@ -32,7 +32,7 @@ RSpec.describe ReverseGeocoding::Points::FetchData do end context 'when point has city and country' do - let(:point) { create(:point, :with_geodata) } + let(:point) { create(:point, :with_geodata, :reverse_geocoded) } before do allow(Geocoder).to receive(:search).and_return(