diff --git a/app/views/stats/index.html.erb b/app/views/stats/index.html.erb
index bac6e0bd..96050095 100644
--- a/app/views/stats/index.html.erb
+++ b/app/views/stats/index.html.erb
@@ -4,7 +4,7 @@
<% end %>
<%= column_chart(
- Stat.year_distance(year, current_user),
+ Stat.year_distance(year, current_user).map { |month_name, distance_meters|
+ [month_name, Stat.convert_distance(distance_meters, current_user.safe_settings.distance_unit).round(2)]
+ },
height: '200px',
suffix: " #{current_user.safe_settings.distance_unit}",
xtitle: 'Days',
diff --git a/app/views/trips/_countries.html.erb b/app/views/trips/_countries.html.erb
index 01fc652b..69a7fe08 100644
--- a/app/views/trips/_countries.html.erb
+++ b/app/views/trips/_countries.html.erb
@@ -2,7 +2,7 @@
diff --git a/app/views/trips/_distance.html.erb b/app/views/trips/_distance.html.erb
index e6e4d13d..6bb835e6 100644
--- a/app/views/trips/_distance.html.erb
+++ b/app/views/trips/_distance.html.erb
@@ -1,5 +1,5 @@
<% if trip.distance.present? %>
-
<%= trip.distance %> <%= distance_unit %>
+
<%= trip.distance_for_user(current_user).round %> <%= distance_unit %>
<% else %>
Calculating...
diff --git a/app/views/trips/_trip.html.erb b/app/views/trips/_trip.html.erb
index f78e78a0..c65373a1 100644
--- a/app/views/trips/_trip.html.erb
+++ b/app/views/trips/_trip.html.erb
@@ -5,7 +5,7 @@
<%= trip.name %>
- <%= "#{human_date(trip.started_at)} – #{human_date(trip.ended_at)}, #{trip.distance} #{current_user.safe_settings.distance_unit}" %>
+ <%= "#{human_date(trip.started_at)} – #{human_date(trip.ended_at)}, #{trip.distance_for_user(current_user).round} #{current_user.safe_settings.distance_unit}" %>
0
+ puts "Enqueuing track creation for user #{user.id} (#{points_count} points)"
+
+ # Use explicit parameters for bulk historical processing:
+ # - No time limits (start_at: nil, end_at: nil) = process ALL historical data
+ Tracks::CreateJob.perform_later(
+ user.id,
+ start_at: nil,
+ end_at: nil,
+ mode: :bulk
+ )
+
+ processed_users += 1
+ else
+ puts "Skipping user #{user.id} (no tracked points)"
+ end
+ end
+
+ puts "Enqueued track creation jobs for #{processed_users}/#{total_users} users"
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/data/20250709195003_recalculate_trips_distance.rb b/db/data/20250709195003_recalculate_trips_distance.rb
new file mode 100644
index 00000000..6c02bd3a
--- /dev/null
+++ b/db/data/20250709195003_recalculate_trips_distance.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RecalculateTripsDistance < ActiveRecord::Migration[8.0]
+ def up
+ Trip.find_each do |trip|
+ trip.enqueue_calculation_jobs
+ end
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/data/20250720171241_recalculate_stats_after_changing_distance_units.rb b/db/data/20250720171241_recalculate_stats_after_changing_distance_units.rb
new file mode 100644
index 00000000..6b23deaf
--- /dev/null
+++ b/db/data/20250720171241_recalculate_stats_after_changing_distance_units.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RecalculateStatsAfterChangingDistanceUnits < ActiveRecord::Migration[8.0]
+ def up
+ BulkStatsCalculatingJob.perform_later
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/data_schema.rb b/db/data_schema.rb
index d245dde6..bdbae245 100644
--- a/db/data_schema.rb
+++ b/db/data_schema.rb
@@ -1 +1 @@
-DataMigrate::Data.define(version: 20250518174305)
+DataMigrate::Data.define(version: 20250720171241)
diff --git a/db/migrate/20250703193656_create_tracks.rb b/db/migrate/20250703193656_create_tracks.rb
new file mode 100644
index 00000000..e595b827
--- /dev/null
+++ b/db/migrate/20250703193656_create_tracks.rb
@@ -0,0 +1,19 @@
+class CreateTracks < ActiveRecord::Migration[8.0]
+ def change
+ create_table :tracks do |t|
+ t.datetime :start_at, null: false
+ t.datetime :end_at, null: false
+ t.references :user, null: false, foreign_key: true
+ t.line_string :original_path, null: false
+ t.decimal :distance, precision: 8, scale: 2
+ t.float :avg_speed
+ t.integer :duration
+ t.integer :elevation_gain
+ t.integer :elevation_loss
+ t.integer :elevation_max
+ t.integer :elevation_min
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20250703193657_add_track_id_to_points.rb b/db/migrate/20250703193657_add_track_id_to_points.rb
new file mode 100644
index 00000000..478f0337
--- /dev/null
+++ b/db/migrate/20250703193657_add_track_id_to_points.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddTrackIdToPoints < ActiveRecord::Migration[8.0]
+ disable_ddl_transaction!
+
+ def change
+ add_reference :points, :track, index: { algorithm: :concurrently }
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4db0f831..837c0927 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[8.0].define(version: 2025_06_27_184017) do
+ActiveRecord::Schema[8.0].define(version: 2025_07_03_193657) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"
enable_extension "postgis"
@@ -181,6 +181,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_184017) do
t.string "external_track_id"
t.geography "lonlat", limit: {srid: 4326, type: "st_point", geographic: true}
t.bigint "country_id"
+ t.bigint "track_id"
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"
@@ -196,6 +197,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_184017) do
t.index ["lonlat"], name: "index_points_on_lonlat", using: :gist
t.index ["reverse_geocoded_at"], name: "index_points_on_reverse_geocoded_at"
t.index ["timestamp"], name: "index_points_on_timestamp"
+ t.index ["track_id"], name: "index_points_on_track_id"
t.index ["trigger"], name: "index_points_on_trigger"
t.index ["user_id"], name: "index_points_on_user_id"
t.index ["visit_id"], name: "index_points_on_visit_id"
@@ -216,6 +218,23 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_184017) do
t.index ["year"], name: "index_stats_on_year"
end
+ create_table "tracks", force: :cascade do |t|
+ t.datetime "start_at", null: false
+ t.datetime "end_at", null: false
+ t.bigint "user_id", null: false
+ t.geometry "original_path", limit: {srid: 0, type: "line_string"}, null: false
+ t.integer "distance"
+ t.float "avg_speed"
+ t.integer "duration"
+ t.integer "elevation_gain"
+ t.integer "elevation_loss"
+ t.integer "elevation_max"
+ t.integer "elevation_min"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["user_id"], name: "index_tracks_on_user_id"
+ end
+
create_table "trips", force: :cascade do |t|
t.string "name", null: false
t.datetime "started_at", null: false
@@ -280,6 +299,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_184017) do
add_foreign_key "points", "users"
add_foreign_key "points", "visits"
add_foreign_key "stats", "users"
+ add_foreign_key "tracks", "users"
add_foreign_key "trips", "users"
add_foreign_key "visits", "areas"
add_foreign_key "visits", "places"
diff --git a/package-lock.json b/package-lock.json
index 16af91c8..2ead76e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,10 @@
"postcss": "^8.4.49",
"trix": "^2.1.15"
},
+ "devDependencies": {
+ "@playwright/test": "^1.54.1",
+ "@types/node": "^24.0.13"
+ },
"engines": {
"node": "18.17.1",
"npm": "9.6.7"
@@ -34,6 +38,22 @@
"@rails/actioncable": "^7.0"
}
},
+ "node_modules/@playwright/test": {
+ "version": "1.54.1",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz",
+ "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "playwright": "1.54.1"
+ },
+ "bin": {
+ "playwright": "cli.js"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/@rails/actioncable": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@rails/actioncable/-/actioncable-7.1.3.tgz",
@@ -58,6 +78,16 @@
"spark-md5": "^3.0.1"
}
},
+ "node_modules/@types/node": {
+ "version": "24.0.13",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.13.tgz",
+ "integrity": "sha512-Qm9OYVOFHFYg3wJoTSrz80hoec5Lia/dPp84do3X7dZvLikQvM1YpmvTBEdIr/e+U8HTkFjLHLnl78K/qjf+jQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "undici-types": "~7.8.0"
+ }
+ },
"node_modules/@types/trusted-types": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -133,6 +163,21 @@
"resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
"integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="
},
+ "node_modules/fsevents": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+ }
+ },
"node_modules/leaflet": {
"version": "1.9.4",
"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
@@ -160,6 +205,38 @@
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
},
+ "node_modules/playwright": {
+ "version": "1.54.1",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",
+ "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "playwright-core": "1.54.1"
+ },
+ "bin": {
+ "playwright": "cli.js"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "optionalDependencies": {
+ "fsevents": "2.3.2"
+ }
+ },
+ "node_modules/playwright-core": {
+ "version": "1.54.1",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",
+ "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "bin": {
+ "playwright-core": "cli.js"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/postcss": {
"version": "8.5.3",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
@@ -226,6 +303,13 @@
"dependencies": {
"dompurify": "^3.2.5"
}
+ },
+ "node_modules/undici-types": {
+ "version": "7.8.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+ "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+ "dev": true,
+ "license": "MIT"
}
},
"dependencies": {
@@ -243,6 +327,15 @@
"@rails/actioncable": "^7.0"
}
},
+ "@playwright/test": {
+ "version": "1.54.1",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz",
+ "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==",
+ "dev": true,
+ "requires": {
+ "playwright": "1.54.1"
+ }
+ },
"@rails/actioncable": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@rails/actioncable/-/actioncable-7.1.3.tgz",
@@ -264,6 +357,15 @@
"spark-md5": "^3.0.1"
}
},
+ "@types/node": {
+ "version": "24.0.13",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.13.tgz",
+ "integrity": "sha512-Qm9OYVOFHFYg3wJoTSrz80hoec5Lia/dPp84do3X7dZvLikQvM1YpmvTBEdIr/e+U8HTkFjLHLnl78K/qjf+jQ==",
+ "dev": true,
+ "requires": {
+ "undici-types": "~7.8.0"
+ }
+ },
"@types/trusted-types": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -318,6 +420,13 @@
"resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
"integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="
},
+ "fsevents": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+ "dev": true,
+ "optional": true
+ },
"leaflet": {
"version": "1.9.4",
"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
@@ -333,6 +442,22 @@
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
},
+ "playwright": {
+ "version": "1.54.1",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",
+ "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",
+ "dev": true,
+ "requires": {
+ "fsevents": "2.3.2",
+ "playwright-core": "1.54.1"
+ }
+ },
+ "playwright-core": {
+ "version": "1.54.1",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",
+ "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",
+ "dev": true
+ },
"postcss": {
"version": "8.5.3",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
@@ -368,6 +493,12 @@
"requires": {
"dompurify": "^3.2.5"
}
+ },
+ "undici-types": {
+ "version": "7.8.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+ "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+ "dev": true
}
}
}
diff --git a/package.json b/package.json
index 41a83df8..927d52fb 100644
--- a/package.json
+++ b/package.json
@@ -10,5 +10,10 @@
"engines": {
"node": "18.17.1",
"npm": "9.6.7"
- }
+ },
+ "devDependencies": {
+ "@playwright/test": "^1.54.1",
+ "@types/node": "^24.0.13"
+ },
+ "scripts": {}
}
diff --git a/spec/channels/tracks_channel_spec.rb b/spec/channels/tracks_channel_spec.rb
new file mode 100644
index 00000000..0e88cc09
--- /dev/null
+++ b/spec/channels/tracks_channel_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe TracksChannel, type: :channel do
+ let(:user) { create(:user) }
+
+ describe '#subscribed' do
+ it 'successfully subscribes to the channel' do
+ stub_connection current_user: user
+
+ subscribe
+
+ expect(subscription).to be_confirmed
+ expect(subscription).to have_stream_for(user)
+ end
+ end
+
+ describe 'track broadcasting' do
+ let!(:track) { create(:track, user: user) }
+
+ before do
+ stub_connection current_user: user
+ subscribe
+ end
+
+ it 'broadcasts track creation' do
+ expect {
+ TracksChannel.broadcast_to(user, {
+ action: 'created',
+ track: {
+ id: track.id,
+ start_at: track.start_at.iso8601,
+ end_at: track.end_at.iso8601,
+ distance: track.distance,
+ avg_speed: track.avg_speed,
+ duration: track.duration,
+ elevation_gain: track.elevation_gain,
+ elevation_loss: track.elevation_loss,
+ elevation_max: track.elevation_max,
+ elevation_min: track.elevation_min,
+ original_path: track.original_path.to_s
+ }
+ })
+ }.to have_broadcasted_to(user)
+ end
+
+ it 'broadcasts track updates' do
+ expect {
+ TracksChannel.broadcast_to(user, {
+ action: 'updated',
+ track: {
+ id: track.id,
+ start_at: track.start_at.iso8601,
+ end_at: track.end_at.iso8601,
+ distance: track.distance,
+ avg_speed: track.avg_speed,
+ duration: track.duration,
+ elevation_gain: track.elevation_gain,
+ elevation_loss: track.elevation_loss,
+ elevation_max: track.elevation_max,
+ elevation_min: track.elevation_min,
+ original_path: track.original_path.to_s
+ }
+ })
+ }.to have_broadcasted_to(user)
+ end
+
+ it 'broadcasts track destruction' do
+ expect {
+ TracksChannel.broadcast_to(user, {
+ action: 'destroyed',
+ track_id: track.id
+ })
+ }.to have_broadcasted_to(user)
+ end
+ end
+end
diff --git a/spec/factories/stats.rb b/spec/factories/stats.rb
index 02eb9e27..4a2ade2a 100644
--- a/spec/factories/stats.rb
+++ b/spec/factories/stats.rb
@@ -4,7 +4,7 @@ FactoryBot.define do
factory :stat do
year { 1 }
month { 1 }
- distance { 1 }
+ distance { 1000 } # 1 km
user
toponyms do
[
diff --git a/spec/factories/tracks.rb b/spec/factories/tracks.rb
new file mode 100644
index 00000000..142c8d5b
--- /dev/null
+++ b/spec/factories/tracks.rb
@@ -0,0 +1,15 @@
+FactoryBot.define do
+ factory :track do
+ association :user
+ start_at { 1.hour.ago }
+ end_at { 30.minutes.ago }
+ original_path { 'LINESTRING(-74.0060 40.7128, -74.0070 40.7130)' }
+ distance { 1500.0 } # in meters
+ avg_speed { 25.0 } # in km/h
+ duration { 1800 } # 30 minutes in seconds
+ elevation_gain { 50 }
+ elevation_loss { 20 }
+ elevation_max { 100 }
+ elevation_min { 50 }
+ end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 296c3bb8..c9eb856e 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -13,12 +13,12 @@ FactoryBot.define do
settings do
{
- 'route_opacity' => '0.5',
- 'meters_between_routes' => '100',
- 'minutes_between_routes' => '100',
+ 'route_opacity' => 60,
+ 'meters_between_routes' => '500',
+ 'minutes_between_routes' => '30',
'fog_of_war_meters' => '100',
- 'time_threshold_minutes' => '100',
- 'merge_threshold_minutes' => '100',
+ 'time_threshold_minutes' => '30',
+ 'merge_threshold_minutes' => '15',
'maps' => {
'distance_unit' => 'km'
}
diff --git a/spec/fixtures/files/geojson/export_same_points.json b/spec/fixtures/files/geojson/export_same_points.json
index 3f6845cc..9a510998 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":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459201,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459202,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459203,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459204,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459205,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459206,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459207,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459208,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}},{"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":1609459209,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null}}]}
+{"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":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459201,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459202,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459203,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459204,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459205,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459206,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459207,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459208,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}},{"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":1609459209,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"course":null,"course_accuracy":null,"external_track_id":null,"track_id":null}}]}
diff --git a/spec/fixtures/files/owntracks/2023-02_old.rec b/spec/fixtures/files/owntracks/2023-02_old.rec
new file mode 100644
index 00000000..a87c0aaf
--- /dev/null
+++ b/spec/fixtures/files/owntracks/2023-02_old.rec
@@ -0,0 +1,10 @@
+2023-02-20T18:46:22Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":14,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918783,"lat":22.0687934,"lon":24.7941786,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918782,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:46:25Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":13,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918785,"lat":22.0687967,"lon":24.7941813,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918785,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:46:25Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":13,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918790,"lat":22.0687967,"lon":24.7941813,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918785,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:46:35Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":14,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918795,"lat":22.0687906,"lon":24.794195,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918795,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:46:40Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":14,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918800,"lat":22.0687967,"lon":24.7941859,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918800,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:46:45Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":14,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918805,"lat":22.0687946,"lon":24.7941883,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918805,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:46:50Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":14,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918810,"lat":22.0687912,"lon":24.7941837,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918810,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:46:55Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":14,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918815,"lat":22.0687927,"lon":24.794186,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918815,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:46:55Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":14,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918815,"lat":22.0687937,"lon":24.794186,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918815,"vac":0,"vel":0,"_http":true}
+2023-02-20T18:47:00Z * {"_type":"location","BSSID":"6c:c4:9f:e0:bb:b1","SSID":"WiFi","acc":14,"alt":136,"batt":38,"bs":1,"conn":"w","created_at":1676918820,"lat":22.0687937,"lon":24.794186,"m":2,"tid":"l6","topic":"owntracks/pixel6/pixel99","tst":1676918820,"vac":0,"vel":0,"_http":true}
diff --git a/spec/jobs/area_visits_calculation_scheduling_job_spec.rb b/spec/jobs/area_visits_calculation_scheduling_job_spec.rb
index 0d375e67..b38ee551 100644
--- a/spec/jobs/area_visits_calculation_scheduling_job_spec.rb
+++ b/spec/jobs/area_visits_calculation_scheduling_job_spec.rb
@@ -4,8 +4,8 @@ require 'rails_helper'
RSpec.describe AreaVisitsCalculationSchedulingJob, type: :job do
describe '#perform' do
- let(:area) { create(:area) }
let(:user) { create(:user) }
+ let(:area) { create(:area, user: user) }
it 'calls the AreaVisitsCalculationService' do
expect(AreaVisitsCalculatingJob).to receive(:perform_later).with(user.id).and_call_original
diff --git a/spec/jobs/bulk_visits_suggesting_job_spec.rb b/spec/jobs/bulk_visits_suggesting_job_spec.rb
index b4545701..66bf7da6 100644
--- a/spec/jobs/bulk_visits_suggesting_job_spec.rb
+++ b/spec/jobs/bulk_visits_suggesting_job_spec.rb
@@ -102,5 +102,17 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do
described_class.perform_now(start_at: custom_start, end_at: custom_end)
end
+
+ context 'when visits suggestions are disabled' do
+ before do
+ allow_any_instance_of(Users::SafeSettings).to receive(:visits_suggestions_enabled?).and_return(false)
+ end
+
+ it 'does not schedule jobs' do
+ expect(VisitSuggestingJob).not_to receive(:perform_later)
+
+ described_class.perform_now
+ end
+ end
end
end
diff --git a/spec/jobs/owntracks/point_creating_job_spec.rb b/spec/jobs/owntracks/point_creating_job_spec.rb
index 3607bc7b..ae8d49fb 100644
--- a/spec/jobs/owntracks/point_creating_job_spec.rb
+++ b/spec/jobs/owntracks/point_creating_job_spec.rb
@@ -28,5 +28,13 @@ RSpec.describe Owntracks::PointCreatingJob, type: :job do
expect { perform }.not_to(change { Point.count })
end
end
+
+ context 'when point is invalid' do
+ let(:point_params) { { lat: 1.0, lon: 1.0, tid: 'test', tst: nil, topic: 'iPhone 12 pro' } }
+
+ it 'does not create a point' do
+ expect { perform }.not_to(change { Point.count })
+ end
+ end
end
end
diff --git a/spec/jobs/places/bulk_name_fetching_job_spec.rb b/spec/jobs/places/bulk_name_fetching_job_spec.rb
new file mode 100644
index 00000000..48704970
--- /dev/null
+++ b/spec/jobs/places/bulk_name_fetching_job_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Places::BulkNameFetchingJob, type: :job do
+ describe '#perform' do
+ let!(:place1) { create(:place, name: Place::DEFAULT_NAME) }
+ let!(:place2) { create(:place, name: Place::DEFAULT_NAME) }
+ let!(:place3) { create(:place, name: 'Other place') }
+
+ it 'enqueues name fetching job for each place with default name' do
+ expect { described_class.perform_now }.to \
+ have_enqueued_job(Places::NameFetchingJob).exactly(2).times
+ end
+
+ it 'does not process places with custom names' do
+ expect { described_class.perform_now }.not_to \
+ have_enqueued_job(Places::NameFetchingJob).with(place3.id)
+ end
+
+ it 'can be enqueued' do
+ expect { described_class.perform_later }.to have_enqueued_job(described_class)
+ .on_queue('places')
+ end
+ end
+end
diff --git a/spec/jobs/places/name_fetching_job_spec.rb b/spec/jobs/places/name_fetching_job_spec.rb
new file mode 100644
index 00000000..d868f845
--- /dev/null
+++ b/spec/jobs/places/name_fetching_job_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Places::NameFetchingJob, type: :job do
+ describe '#perform' do
+ let(:place) { create(:place, name: Place::DEFAULT_NAME) }
+ let(:name_fetcher) { instance_double(Places::NameFetcher) }
+
+ before do
+ allow(Places::NameFetcher).to receive(:new).with(place).and_return(name_fetcher)
+ allow(name_fetcher).to receive(:call)
+ end
+
+ it 'finds the place and calls NameFetcher' do
+ expect(Place).to receive(:find).with(place.id).and_return(place)
+ expect(Places::NameFetcher).to receive(:new).with(place)
+ expect(name_fetcher).to receive(:call)
+
+ described_class.perform_now(place.id)
+ end
+
+ it 'can be enqueued' do
+ expect { described_class.perform_later(place.id) }.to have_enqueued_job(described_class)
+ .with(place.id)
+ .on_queue('places')
+ end
+ end
+end
diff --git a/spec/jobs/tracks/cleanup_job_spec.rb b/spec/jobs/tracks/cleanup_job_spec.rb
new file mode 100644
index 00000000..d4823f86
--- /dev/null
+++ b/spec/jobs/tracks/cleanup_job_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Tracks::CleanupJob, type: :job do
+ let(:user) { create(:user) }
+
+ describe '#perform' do
+ context 'with old untracked points' do
+ let!(:old_points) do
+ create_points_around(user: user, count: 1, base_lat: 20.0, timestamp: 2.days.ago.to_i)
+ create_points_around(user: user, count: 1, base_lat: 20.0, timestamp: 1.day.ago.to_i)
+ end
+ let!(:recent_points) do
+ create_points_around(user: user, count: 2, base_lat: 20.0, timestamp: 1.hour.ago.to_i)
+ end
+ let(:generator) { instance_double(Tracks::Generator) }
+
+ it 'processes only old untracked points' do
+ expect(Tracks::Generator).to receive(:new)
+ .and_return(generator)
+
+ expect(generator).to receive(:call)
+
+ described_class.new.perform(older_than: 1.day.ago)
+ end
+
+ it 'logs processing information' do
+ allow(Tracks::Generator).to receive(:new).and_return(double(call: nil))
+
+ expect(Rails.logger).to receive(:info).with(/Processing missed tracks for user #{user.id}/)
+
+ described_class.new.perform(older_than: 1.day.ago)
+ end
+ end
+
+ context 'with users having insufficient points' do
+ let!(:single_point) do
+ create_points_around(user: user, count: 1, base_lat: 20.0, timestamp: 2.days.ago.to_i)
+ end
+
+ it 'skips users with less than 2 points' do
+ expect(Tracks::Generator).not_to receive(:new)
+
+ described_class.new.perform(older_than: 1.day.ago)
+ end
+ end
+
+ context 'with no old untracked points' do
+ let(:track) { create(:track, user: user) }
+ let!(:tracked_points) do
+ create_points_around(user: user, count: 3, base_lat: 20.0, timestamp: 2.days.ago.to_i, track: track)
+ end
+
+ it 'does not process any users' do
+ expect(Tracks::Generator).not_to receive(:new)
+
+ described_class.new.perform(older_than: 1.day.ago)
+ end
+ end
+
+ context 'with custom older_than parameter' do
+ let!(:points) do
+ create_points_around(user: user, count: 3, base_lat: 20.0, timestamp: 3.days.ago.to_i)
+ end
+ let(:generator) { instance_double(Tracks::Generator) }
+
+ it 'uses custom threshold' do
+ expect(Tracks::Generator).to receive(:new)
+ .and_return(generator)
+
+ expect(generator).to receive(:call)
+
+ described_class.new.perform(older_than: 2.days.ago)
+ end
+ end
+ end
+
+ describe 'job configuration' do
+ it 'uses tracks queue' do
+ expect(described_class.queue_name).to eq('tracks')
+ end
+
+ it 'does not retry on failure' do
+ expect(described_class.sidekiq_options_hash['retry']).to be false
+ end
+ end
+end
diff --git a/spec/jobs/tracks/create_job_spec.rb b/spec/jobs/tracks/create_job_spec.rb
new file mode 100644
index 00000000..bc2648d9
--- /dev/null
+++ b/spec/jobs/tracks/create_job_spec.rb
@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Tracks::CreateJob, type: :job do
+ let(:user) { create(:user) }
+
+ describe '#perform' do
+ let(:generator_instance) { instance_double(Tracks::Generator) }
+ let(:notification_service) { instance_double(Notifications::Create) }
+
+ before do
+ allow(Tracks::Generator).to receive(:new).and_return(generator_instance)
+ allow(generator_instance).to receive(:call)
+ allow(Notifications::Create).to receive(:new).and_return(notification_service)
+ allow(notification_service).to receive(:call)
+ allow(generator_instance).to receive(:call).and_return(2)
+ end
+
+ it 'calls the generator and creates a notification' do
+ described_class.new.perform(user.id)
+
+ expect(Tracks::Generator).to have_received(:new).with(
+ user,
+ start_at: nil,
+ end_at: nil,
+ mode: :daily
+ )
+ expect(generator_instance).to have_received(:call)
+ expect(Notifications::Create).to have_received(:new).with(
+ user: user,
+ kind: :info,
+ title: 'Tracks Generated',
+ content: 'Created 2 tracks from your location data. Check your tracks section to view them.'
+ )
+ expect(notification_service).to have_received(:call)
+ end
+
+ context 'with custom parameters' do
+ let(:start_at) { 1.day.ago.beginning_of_day.to_i }
+ let(:end_at) { 1.day.ago.end_of_day.to_i }
+ let(:mode) { :daily }
+
+ before do
+ allow(Tracks::Generator).to receive(:new).and_return(generator_instance)
+ allow(generator_instance).to receive(:call)
+ allow(Notifications::Create).to receive(:new).and_return(notification_service)
+ allow(notification_service).to receive(:call)
+ allow(generator_instance).to receive(:call).and_return(1)
+ end
+
+ it 'passes custom parameters to the generator' do
+ described_class.new.perform(user.id, start_at: start_at, end_at: end_at, mode: mode)
+
+ expect(Tracks::Generator).to have_received(:new).with(
+ user,
+ start_at: start_at,
+ end_at: end_at,
+ mode: :daily
+ )
+ expect(generator_instance).to have_received(:call)
+ expect(Notifications::Create).to have_received(:new).with(
+ user: user,
+ kind: :info,
+ title: 'Tracks Generated',
+ content: 'Created 1 tracks from your location data. Check your tracks section to view them.'
+ )
+ expect(notification_service).to have_received(:call)
+ end
+ end
+
+ context 'when generator raises an error' do
+ let(:error_message) { 'Something went wrong' }
+ let(:notification_service) { instance_double(Notifications::Create) }
+
+ before do
+ allow(Tracks::Generator).to receive(:new).and_return(generator_instance)
+ allow(generator_instance).to receive(:call).and_raise(StandardError, error_message)
+ allow(Notifications::Create).to receive(:new).and_return(notification_service)
+ allow(notification_service).to receive(:call)
+ end
+
+ it 'creates an error notification' do
+ described_class.new.perform(user.id)
+
+ expect(Notifications::Create).to have_received(:new).with(
+ user: user,
+ kind: :error,
+ title: 'Track Generation Failed',
+ content: "Failed to generate tracks from your location data: #{error_message}"
+ )
+ expect(notification_service).to have_received(:call)
+ end
+
+ it 'reports the error using ExceptionReporter' do
+ allow(ExceptionReporter).to receive(:call)
+
+ described_class.new.perform(user.id)
+
+ expect(ExceptionReporter).to have_received(:call).with(
+ kind_of(StandardError),
+ 'Failed to create tracks for user'
+ )
+ end
+ end
+
+ context 'when user does not exist' do
+ before do
+ allow(User).to receive(:find).with(999).and_raise(ActiveRecord::RecordNotFound)
+ allow(ExceptionReporter).to receive(:call)
+ allow(Notifications::Create).to receive(:new).and_return(instance_double(Notifications::Create, call: nil))
+ end
+
+ it 'handles the error gracefully and creates error notification' do
+ expect { described_class.new.perform(999) }.not_to raise_error
+
+ expect(ExceptionReporter).to have_received(:call)
+ end
+ end
+
+ context 'when tracks are deleted and recreated' do
+ let(:existing_tracks) { create_list(:track, 3, user: user) }
+
+ before do
+ allow(generator_instance).to receive(:call).and_return(2)
+ end
+
+ it 'returns the correct count of newly created tracks' do
+ described_class.new.perform(user.id, mode: :incremental)
+
+ expect(Tracks::Generator).to have_received(:new).with(
+ user,
+ start_at: nil,
+ end_at: nil,
+ mode: :incremental
+ )
+ expect(generator_instance).to have_received(:call)
+ expect(Notifications::Create).to have_received(:new).with(
+ user: user,
+ kind: :info,
+ title: 'Tracks Generated',
+ content: 'Created 2 tracks from your location data. Check your tracks section to view them.'
+ )
+ expect(notification_service).to have_received(:call)
+ end
+ end
+ end
+
+ describe 'queue' do
+ it 'is queued on tracks queue' do
+ expect(described_class.new.queue_name).to eq('tracks')
+ end
+ end
+end
diff --git a/spec/jobs/tracks/incremental_check_job_spec.rb b/spec/jobs/tracks/incremental_check_job_spec.rb
new file mode 100644
index 00000000..c25d1299
--- /dev/null
+++ b/spec/jobs/tracks/incremental_check_job_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Tracks::IncrementalCheckJob, type: :job do
+ let(:user) { create(:user) }
+ let(:point) { create(:point, user: user) }
+
+ describe '#perform' do
+ context 'with valid parameters' do
+ let(:processor) { instance_double(Tracks::IncrementalProcessor) }
+
+ it 'calls the incremental processor' do
+ expect(Tracks::IncrementalProcessor).to receive(:new)
+ .with(user, point)
+ .and_return(processor)
+
+ expect(processor).to receive(:call)
+
+ described_class.new.perform(user.id, point.id)
+ end
+ end
+ end
+
+ describe 'job configuration' do
+ it 'uses tracks queue' do
+ expect(described_class.queue_name).to eq('tracks')
+ end
+ end
+
+ describe 'integration with ActiveJob' do
+ it 'enqueues the job' do
+ expect do
+ described_class.perform_later(user.id, point.id)
+ end.to have_enqueued_job(described_class)
+ .with(user.id, point.id)
+ end
+ end
+end
diff --git a/spec/models/point_spec.rb b/spec/models/point_spec.rb
index 7b5acd77..644f8003 100644
--- a/spec/models/point_spec.rb
+++ b/spec/models/point_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe Point, type: :model do
it { is_expected.to belong_to(:user) }
it { is_expected.to belong_to(:country).optional }
it { is_expected.to belong_to(:visit).optional }
+ it { is_expected.to belong_to(:track).optional }
end
describe 'validations' do
@@ -28,6 +29,17 @@ RSpec.describe Point, type: :model do
expect(point.country_id).to eq(country.id)
end
end
+
+ describe '#recalculate_track' do
+ let(:point) { create(:point, track: track) }
+ let(:track) { create(:track) }
+
+ it 'recalculates the track' do
+ expect(track).to receive(:recalculate_path_and_distance!)
+
+ point.update(lonlat: 'POINT(-79.85581250721961 15.854775993302411)')
+ end
+ end
end
describe 'scopes' do
@@ -108,5 +120,16 @@ RSpec.describe Point, type: :model do
expect(point.lat).to eq(2)
end
end
+
+ describe '#trigger_incremental_track_generation' do
+ let(:point) do
+ create(:point, track: track, import_id: nil, timestamp: 1.hour.ago.to_i, reverse_geocoded_at: 1.hour.ago)
+ end
+ let(:track) { create(:track) }
+
+ it 'enqueues Tracks::IncrementalCheckJob' do
+ expect { point.send(:trigger_incremental_track_generation) }.to have_enqueued_job(Tracks::IncrementalCheckJob).with(point.user_id, point.id)
+ end
+ end
end
end
diff --git a/spec/models/stat_spec.rb b/spec/models/stat_spec.rb
index 90337f2f..ee4c477f 100644
--- a/spec/models/stat_spec.rb
+++ b/spec/models/stat_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Stat, type: :model do
create(:point, user:, lonlat: 'POINT(2 2)', timestamp: DateTime.new(year, 1, 1, 2))
end
- before { expected_distance[0][1] = 156.88 }
+ before { expected_distance[0][1] = 156_876 }
it 'returns distance by day' do
expect(subject).to eq(expected_distance)
diff --git a/spec/models/track_spec.rb b/spec/models/track_spec.rb
new file mode 100644
index 00000000..70ed1f2d
--- /dev/null
+++ b/spec/models/track_spec.rb
@@ -0,0 +1,193 @@
+require 'rails_helper'
+
+RSpec.describe Track, type: :model do
+ describe 'associations' do
+ it { is_expected.to belong_to(:user) }
+ it { is_expected.to have_many(:points).dependent(:nullify) }
+ end
+
+ describe 'validations' do
+ subject { build(:track) }
+
+ it { is_expected.to validate_presence_of(:start_at) }
+ it { is_expected.to validate_presence_of(:end_at) }
+ it { is_expected.to validate_presence_of(:original_path) }
+ it { is_expected.to validate_numericality_of(:distance).is_greater_than_or_equal_to(0) }
+ it { is_expected.to validate_numericality_of(:avg_speed).is_greater_than_or_equal_to(0) }
+ it { is_expected.to validate_numericality_of(:duration).is_greater_than_or_equal_to(0) }
+ end
+
+ describe '.last_for_day' do
+ let(:user) { create(:user) }
+ let(:other_user) { create(:user) }
+ let(:target_day) { Date.current }
+
+ context 'when user has tracks on the target day' do
+ let!(:early_track) do
+ create(:track, user: user,
+ start_at: target_day.beginning_of_day + 1.hour,
+ end_at: target_day.beginning_of_day + 2.hours)
+ end
+
+ let!(:late_track) do
+ create(:track, user: user,
+ start_at: target_day.beginning_of_day + 3.hours,
+ end_at: target_day.beginning_of_day + 4.hours)
+ end
+
+ let!(:other_user_track) do
+ create(:track, user: other_user,
+ start_at: target_day.beginning_of_day + 5.hours,
+ end_at: target_day.beginning_of_day + 6.hours)
+ end
+
+ it 'returns the track that ends latest on that day for the user' do
+ result = Track.last_for_day(user, target_day)
+ expect(result).to eq(late_track)
+ end
+
+ it 'does not return tracks from other users' do
+ result = Track.last_for_day(user, target_day)
+ expect(result).not_to eq(other_user_track)
+ end
+ end
+
+ context 'when user has tracks on different days' do
+ let!(:yesterday_track) do
+ create(:track, user: user,
+ start_at: target_day.yesterday.beginning_of_day + 1.hour,
+ end_at: target_day.yesterday.beginning_of_day + 2.hours)
+ end
+
+ let!(:tomorrow_track) do
+ create(:track, user: user,
+ start_at: target_day.tomorrow.beginning_of_day + 1.hour,
+ end_at: target_day.tomorrow.beginning_of_day + 2.hours)
+ end
+
+ let!(:target_day_track) do
+ create(:track, user: user,
+ start_at: target_day.beginning_of_day + 1.hour,
+ end_at: target_day.beginning_of_day + 2.hours)
+ end
+
+ it 'returns only the track from the target day' do
+ result = Track.last_for_day(user, target_day)
+ expect(result).to eq(target_day_track)
+ end
+ end
+
+ context 'when user has no tracks on the target day' do
+ let!(:yesterday_track) do
+ create(:track, user: user,
+ start_at: target_day.yesterday.beginning_of_day + 1.hour,
+ end_at: target_day.yesterday.beginning_of_day + 2.hours)
+ end
+
+ it 'returns nil' do
+ result = Track.last_for_day(user, target_day)
+ expect(result).to be_nil
+ end
+ end
+
+ context 'when passing a Time object instead of Date' do
+ let!(:track) do
+ create(:track, user: user,
+ start_at: target_day.beginning_of_day + 1.hour,
+ end_at: target_day.beginning_of_day + 2.hours)
+ end
+
+ it 'correctly handles Time objects' do
+ result = Track.last_for_day(user, target_day.to_time)
+ expect(result).to eq(track)
+ end
+ end
+
+ context 'when track spans midnight' do
+ let!(:spanning_track) do
+ create(:track, user: user,
+ start_at: target_day.beginning_of_day - 1.hour,
+ end_at: target_day.beginning_of_day + 1.hour)
+ end
+
+ it 'includes tracks that end on the target day' do
+ result = Track.last_for_day(user, target_day)
+ expect(result).to eq(spanning_track)
+ end
+ end
+ end
+
+ describe 'Calculateable concern' do
+ let(:user) { create(:user) }
+ let(:track) { create(:track, user: user, distance: 1000, avg_speed: 25, duration: 3600) }
+ let!(:points) do
+ [
+ create(:point, user: user, track: track, lonlat: 'POINT(13.404954 52.520008)', timestamp: 1.hour.ago.to_i),
+ create(:point, user: user, track: track, lonlat: 'POINT(13.405954 52.521008)', timestamp: 30.minutes.ago.to_i),
+ create(:point, user: user, track: track, lonlat: 'POINT(13.406954 52.522008)', timestamp: Time.current.to_i)
+ ]
+ end
+
+ describe '#calculate_path' do
+ it 'updates the original_path with calculated path' do
+ original_path_before = track.original_path
+ track.calculate_path
+
+ expect(track.original_path).not_to eq(original_path_before)
+ expect(track.original_path).to be_present
+ end
+ end
+
+ describe '#calculate_distance' do
+ it 'updates the distance based on points' do
+ track.calculate_distance
+
+ expect(track.distance).to be > 0
+ expect(track.distance).to be_a(Numeric)
+ end
+
+ it 'stores distance in meters consistently' do
+ allow(Point).to receive(:total_distance).and_return(1500) # 1500 meters
+
+ track.calculate_distance
+
+ expect(track.distance).to eq(1500) # Should be stored as meters regardless of user unit preference
+ end
+ end
+
+ describe '#recalculate_distance!' do
+ it 'recalculates and saves the distance' do
+ original_distance = track.distance
+
+ track.recalculate_distance!
+
+ track.reload
+ expect(track.distance).not_to eq(original_distance)
+ end
+ end
+
+ describe '#recalculate_path!' do
+ it 'recalculates and saves the path' do
+ original_path = track.original_path
+
+ track.recalculate_path!
+
+ track.reload
+ expect(track.original_path).not_to eq(original_path)
+ end
+ end
+
+ describe '#recalculate_path_and_distance!' do
+ it 'recalculates both path and distance and saves' do
+ original_distance = track.distance
+ original_path = track.original_path
+
+ track.recalculate_path_and_distance!
+
+ track.reload
+ expect(track.distance).not_to eq(original_distance)
+ expect(track.original_path).not_to eq(original_path)
+ end
+ end
+ end
+end
diff --git a/spec/models/trip_spec.rb b/spec/models/trip_spec.rb
index 7b2bf233..20bb5ba3 100644
--- a/spec/models/trip_spec.rb
+++ b/spec/models/trip_spec.rb
@@ -137,4 +137,49 @@ RSpec.describe Trip, type: :model do
end
end
end
+
+ describe 'Calculateable concern' do
+ let(:user) { create(:user) }
+ let(:trip) { create(:trip, user: user) }
+ let!(:points) do
+ [
+ create(:point, user: user, lonlat: 'POINT(13.404954 52.520008)', timestamp: trip.started_at.to_i + 1.hour),
+ create(:point, user: user, lonlat: 'POINT(13.404955 52.520009)', timestamp: trip.started_at.to_i + 2.hours),
+ create(:point, user: user, lonlat: 'POINT(13.404956 52.520010)', timestamp: trip.started_at.to_i + 3.hours)
+ ]
+ end
+
+ describe '#calculate_distance' do
+ it 'stores distance in user preferred unit for Trip model' do
+ allow(user).to receive(:safe_settings).and_return(double(distance_unit: 'km'))
+ allow(Point).to receive(:total_distance).and_return(2.5) # 2.5 km
+
+ trip.calculate_distance
+
+ expect(trip.distance).to eq(3) # Should be rounded, in km
+ end
+ end
+
+ describe '#recalculate_distance!' do
+ it 'recalculates and saves the distance' do
+ original_distance = trip.distance
+
+ trip.recalculate_distance!
+
+ trip.reload
+ expect(trip.distance).not_to eq(original_distance)
+ end
+ end
+
+ describe '#recalculate_path!' do
+ it 'recalculates and saves the path' do
+ original_path = trip.path
+
+ trip.recalculate_path!
+
+ trip.reload
+ expect(trip.path).not_to eq(original_path)
+ end
+ end
+ end
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2b431d44..a1c5601f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe User, type: :model do
it { is_expected.to have_many(:visits).dependent(:destroy) }
it { is_expected.to have_many(:places).through(:visits) }
it { is_expected.to have_many(:trips).dependent(:destroy) }
+ it { is_expected.to have_many(:tracks).dependent(:destroy) }
end
describe 'enums' do
@@ -87,11 +88,11 @@ RSpec.describe User, type: :model do
describe '#total_distance' do
subject { user.total_distance }
- let!(:stat1) { create(:stat, user:, distance: 10) }
- let!(:stat2) { create(:stat, user:, distance: 20) }
+ let!(:stat1) { create(:stat, user:, distance: 10_000) }
+ let!(:stat2) { create(:stat, user:, distance: 20_000) }
it 'returns sum of distances' do
- expect(subject).to eq(30)
+ expect(subject).to eq(30) # 30 km
end
end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4e34b6af..0cd0f177 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -13,6 +13,10 @@ require 'super_diff/rspec-rails'
require 'rake'
Rails.application.load_tasks
+
+# Ensure Devise is properly configured for tests
+require 'devise'
+
# Add additional requires below this line. Rails is not loaded until this point!
Dir[Rails.root.join('spec/support/**/*.rb')].sort.each { |f| require f }
@@ -32,11 +36,13 @@ RSpec.configure do |config|
config.filter_rails_from_backtrace!
config.include FactoryBot::Syntax::Methods
- config.include Devise::Test::IntegrationHelpers, type: :request
- config.include Devise::Test::IntegrationHelpers, type: :system
config.rswag_dry_run = false
+ config.before(:suite) do
+ Rails.application.reload_routes!
+ end
+
config.before do
ActiveJob::Base.queue_adapter = :test
allow(DawarichSettings).to receive(:store_geodata?).and_return(true)
diff --git a/spec/requests/api/v1/stats_spec.rb b/spec/requests/api/v1/stats_spec.rb
index 89cdc8e4..43e8f142 100644
--- a/spec/requests/api/v1/stats_spec.rb
+++ b/spec/requests/api/v1/stats_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe 'Api::V1::Stats', type: :request do
end
let(:expected_json) do
{
- totalDistanceKm: stats_in_2020.map(&:distance).sum + stats_in_2021.map(&:distance).sum,
+ totalDistanceKm: (stats_in_2020.map(&:distance).sum + stats_in_2021.map(&:distance).sum) / 1000,
totalPointsTracked: points_in_2020.count + points_in_2021.count,
totalReverseGeocodedPoints: points_in_2020.count + points_in_2021.count,
totalCountriesVisited: 1,
@@ -29,7 +29,7 @@ RSpec.describe 'Api::V1::Stats', type: :request do
yearlyStats: [
{
year: 2021,
- totalDistanceKm: 12,
+ totalDistanceKm: (stats_in_2021.map(&:distance).sum / 1000).to_i,
totalCountriesVisited: 1,
totalCitiesVisited: 1,
monthlyDistanceKm: {
@@ -49,7 +49,7 @@ RSpec.describe 'Api::V1::Stats', type: :request do
},
{
year: 2020,
- totalDistanceKm: 12,
+ totalDistanceKm: (stats_in_2020.map(&:distance).sum / 1000).to_i,
totalCountriesVisited: 1,
totalCitiesVisited: 1,
monthlyDistanceKm: {
diff --git a/spec/requests/api/v1/users_spec.rb b/spec/requests/api/v1/users_spec.rb
index 3075a94f..b1669b39 100644
--- a/spec/requests/api/v1/users_spec.rb
+++ b/spec/requests/api/v1/users_spec.rb
@@ -7,12 +7,28 @@ RSpec.describe 'Api::V1::Users', type: :request do
let(:user) { create(:user) }
let(:headers) { { 'Authorization' => "Bearer #{user.api_key}" } }
- it 'returns http success' do
+ it 'returns success response' do
get '/api/v1/users/me', headers: headers
expect(response).to have_http_status(:success)
- expect(response.body).to include(user.email)
- expect(response.body).to include(user.id.to_s)
+ end
+
+ it 'returns only the keys and values stated in the serializer' do
+ get '/api/v1/users/me', headers: headers
+
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ expect(json.keys).to eq([:user])
+ expect(json[:user].keys).to match_array(
+ %i[email theme created_at updated_at settings]
+ )
+ expect(json[:user][:settings].keys).to match_array(%i[
+ maps fog_of_war_meters meters_between_routes preferred_map_layer
+ speed_colored_routes points_rendering_mode minutes_between_routes
+ time_threshold_minutes merge_threshold_minutes live_map_enabled
+ route_opacity immich_url photoprism_url visits_suggestions_enabled
+ speed_color_scale fog_of_war_threshold
+ ])
end
end
end
diff --git a/spec/requests/settings_spec.rb b/spec/requests/settings_spec.rb
index a06d0b40..0d99f03d 100644
--- a/spec/requests/settings_spec.rb
+++ b/spec/requests/settings_spec.rb
@@ -80,7 +80,9 @@ RSpec.describe 'Settings', type: :request do
it 'updates the user settings' do
patch '/settings', params: params
- expect(user.reload.settings).to eq(params[:settings])
+ user.reload
+ expect(user.settings['meters_between_routes']).to eq('1000')
+ expect(user.settings['minutes_between_routes']).to eq('10')
end
context 'when user is inactive' do
diff --git a/spec/serializers/api/user_serializer_spec.rb b/spec/serializers/api/user_serializer_spec.rb
new file mode 100644
index 00000000..178c64e0
--- /dev/null
+++ b/spec/serializers/api/user_serializer_spec.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Api::UserSerializer do
+ describe '#call' do
+ subject(:serializer) { described_class.new(user).call }
+
+ let(:user) { create(:user, email: 'test@example.com', theme: 'dark') }
+
+ it 'returns JSON with correct user attributes' do
+ expect(serializer[:user][:email]).to eq(user.email)
+ expect(serializer[:user][:theme]).to eq(user.theme)
+ expect(serializer[:user][:created_at]).to eq(user.created_at)
+ expect(serializer[:user][:updated_at]).to eq(user.updated_at)
+ end
+
+ it 'returns settings with expected keys and types' do
+ settings = serializer[:user][:settings]
+ expect(settings).to include(
+ :maps,
+ :fog_of_war_meters,
+ :meters_between_routes,
+ :preferred_map_layer,
+ :speed_colored_routes,
+ :points_rendering_mode,
+ :minutes_between_routes,
+ :time_threshold_minutes,
+ :merge_threshold_minutes,
+ :live_map_enabled,
+ :route_opacity,
+ :immich_url,
+ :photoprism_url,
+ :visits_suggestions_enabled,
+ :speed_color_scale,
+ :fog_of_war_threshold
+ )
+ end
+
+ context 'with custom settings' do
+ let(:custom_settings) do
+ {
+ 'fog_of_war_meters' => 123,
+ 'meters_between_routes' => 456,
+ 'preferred_map_layer' => 'Satellite',
+ 'speed_colored_routes' => true,
+ 'points_rendering_mode' => 'cluster',
+ 'minutes_between_routes' => 42,
+ 'time_threshold_minutes' => 99,
+ 'merge_threshold_minutes' => 77,
+ 'live_map_enabled' => false,
+ 'route_opacity' => 0.75,
+ 'immich_url' => 'https://immich.example.com',
+ 'photoprism_url' => 'https://photoprism.example.com',
+ 'visits_suggestions_enabled' => 'false',
+ 'speed_color_scale' => 'rainbow',
+ 'fog_of_war_threshold' => 5,
+ 'maps' => { 'distance_unit' => 'mi' }
+ }
+ end
+
+ let(:user) { create(:user, settings: custom_settings) }
+
+ it 'serializes custom settings correctly' do
+ settings = serializer[:user][:settings]
+ expect(settings[:fog_of_war_meters]).to eq(123)
+ expect(settings[:meters_between_routes]).to eq(456)
+ expect(settings[:preferred_map_layer]).to eq('Satellite')
+ expect(settings[:speed_colored_routes]).to eq(true)
+ expect(settings[:points_rendering_mode]).to eq('cluster')
+ expect(settings[:minutes_between_routes]).to eq(42)
+ expect(settings[:time_threshold_minutes]).to eq(99)
+ expect(settings[:merge_threshold_minutes]).to eq(77)
+ expect(settings[:live_map_enabled]).to eq(false)
+ expect(settings[:route_opacity]).to eq(0.75)
+ expect(settings[:immich_url]).to eq('https://immich.example.com')
+ expect(settings[:photoprism_url]).to eq('https://photoprism.example.com')
+ expect(settings[:visits_suggestions_enabled]).to eq(false)
+ expect(settings[:speed_color_scale]).to eq('rainbow')
+ expect(settings[:fog_of_war_threshold]).to eq(5)
+ expect(settings[:maps]).to eq({ 'distance_unit' => 'mi' })
+ end
+ end
+ end
+end
diff --git a/spec/serializers/point_serializer_spec.rb b/spec/serializers/point_serializer_spec.rb
index 2f2a9742..e202a761 100644
--- a/spec/serializers/point_serializer_spec.rb
+++ b/spec/serializers/point_serializer_spec.rb
@@ -29,11 +29,12 @@ RSpec.describe PointSerializer do
'inrids' => point.inrids,
'in_regions' => point.in_regions,
'city' => point.city,
- 'country' => point.country,
+ 'country' => point.read_attribute(:country),
'geodata' => point.geodata,
'course' => point.course,
'course_accuracy' => point.course_accuracy,
- 'external_track_id' => point.external_track_id
+ 'external_track_id' => point.external_track_id,
+ 'track_id' => point.track_id
}
end
diff --git a/spec/serializers/stats_serializer_spec.rb b/spec/serializers/stats_serializer_spec.rb
index 2fba6656..eef34e59 100644
--- a/spec/serializers/stats_serializer_spec.rb
+++ b/spec/serializers/stats_serializer_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe StatsSerializer do
end
let(:expected_json) do
{
- "totalDistanceKm": stats_in_2020.map(&:distance).sum + stats_in_2021.map(&:distance).sum,
+ "totalDistanceKm": (stats_in_2020.map(&:distance).sum + stats_in_2021.map(&:distance).sum) / 1000,
"totalPointsTracked": points_in_2020.count + points_in_2021.count,
"totalReverseGeocodedPoints": points_in_2020.count + points_in_2021.count,
"totalCountriesVisited": 1,
@@ -48,7 +48,7 @@ RSpec.describe StatsSerializer do
"yearlyStats": [
{
"year": 2021,
- "totalDistanceKm": 12,
+ "totalDistanceKm": (stats_in_2021.map(&:distance).sum / 1000).to_i,
"totalCountriesVisited": 1,
"totalCitiesVisited": 1,
"monthlyDistanceKm": {
@@ -68,7 +68,7 @@ RSpec.describe StatsSerializer do
},
{
"year": 2020,
- "totalDistanceKm": 12,
+ "totalDistanceKm": (stats_in_2020.map(&:distance).sum / 1000).to_i,
"totalCountriesVisited": 1,
"totalCitiesVisited": 1,
"monthlyDistanceKm": {
diff --git a/spec/serializers/track_serializer_spec.rb b/spec/serializers/track_serializer_spec.rb
new file mode 100644
index 00000000..6622b23d
--- /dev/null
+++ b/spec/serializers/track_serializer_spec.rb
@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe TrackSerializer do
+ describe '#call' do
+ let(:user) { create(:user) }
+ let(:track) { create(:track, user: user) }
+ let(:serializer) { described_class.new(track) }
+
+ subject(:serialized_track) { serializer.call }
+
+ it 'returns a hash with all required attributes' do
+ expect(serialized_track).to be_a(Hash)
+ expect(serialized_track.keys).to contain_exactly(
+ :id, :start_at, :end_at, :distance, :avg_speed, :duration,
+ :elevation_gain, :elevation_loss, :elevation_max, :elevation_min, :original_path
+ )
+ end
+
+ it 'serializes the track ID correctly' do
+ expect(serialized_track[:id]).to eq(track.id)
+ end
+
+ it 'formats start_at as ISO8601 timestamp' do
+ expect(serialized_track[:start_at]).to eq(track.start_at.iso8601)
+ expect(serialized_track[:start_at]).to match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
+ end
+
+ it 'formats end_at as ISO8601 timestamp' do
+ expect(serialized_track[:end_at]).to eq(track.end_at.iso8601)
+ expect(serialized_track[:end_at]).to match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
+ end
+
+ it 'converts distance to integer' do
+ expect(serialized_track[:distance]).to eq(track.distance.to_i)
+ expect(serialized_track[:distance]).to be_a(Integer)
+ end
+
+ it 'converts avg_speed to float' do
+ expect(serialized_track[:avg_speed]).to eq(track.avg_speed.to_f)
+ expect(serialized_track[:avg_speed]).to be_a(Float)
+ end
+
+ it 'serializes duration as numeric value' do
+ expect(serialized_track[:duration]).to eq(track.duration)
+ expect(serialized_track[:duration]).to be_a(Numeric)
+ end
+
+ it 'serializes elevation_gain as numeric value' do
+ expect(serialized_track[:elevation_gain]).to eq(track.elevation_gain)
+ expect(serialized_track[:elevation_gain]).to be_a(Numeric)
+ end
+
+ it 'serializes elevation_loss as numeric value' do
+ expect(serialized_track[:elevation_loss]).to eq(track.elevation_loss)
+ expect(serialized_track[:elevation_loss]).to be_a(Numeric)
+ end
+
+ it 'serializes elevation_max as numeric value' do
+ expect(serialized_track[:elevation_max]).to eq(track.elevation_max)
+ expect(serialized_track[:elevation_max]).to be_a(Numeric)
+ end
+
+ it 'serializes elevation_min as numeric value' do
+ expect(serialized_track[:elevation_min]).to eq(track.elevation_min)
+ expect(serialized_track[:elevation_min]).to be_a(Numeric)
+ end
+
+ it 'converts original_path to string' do
+ expect(serialized_track[:original_path]).to eq(track.original_path.to_s)
+ expect(serialized_track[:original_path]).to be_a(String)
+ end
+
+ context 'with decimal distance values' do
+ let(:track) { create(:track, user: user, distance: 1234.56) }
+
+ it 'truncates distance to integer' do
+ expect(serialized_track[:distance]).to eq(1234)
+ end
+ end
+
+ context 'with decimal avg_speed values' do
+ let(:track) { create(:track, user: user, avg_speed: 25.75) }
+
+ it 'converts avg_speed to float' do
+ expect(serialized_track[:avg_speed]).to eq(25.75)
+ end
+ end
+
+ context 'with different original_path formats' do
+ let(:track) { create(:track, user: user, original_path: 'LINESTRING(0 0, 1 1, 2 2)') }
+
+ it 'converts geometry to WKT string format' do
+ expect(serialized_track[:original_path]).to match(/LINESTRING \(0(\.0)? 0(\.0)?, 1(\.0)? 1(\.0)?, 2(\.0)? 2(\.0)?\)/)
+ expect(serialized_track[:original_path]).to be_a(String)
+ end
+ end
+
+ context 'with zero values' do
+ let(:track) do
+ create(:track, user: user,
+ distance: 0,
+ avg_speed: 0.0,
+ duration: 0,
+ elevation_gain: 0,
+ elevation_loss: 0,
+ elevation_max: 0,
+ elevation_min: 0)
+ end
+
+ it 'handles zero values correctly' do
+ expect(serialized_track[:distance]).to eq(0)
+ expect(serialized_track[:avg_speed]).to eq(0.0)
+ expect(serialized_track[:duration]).to eq(0)
+ expect(serialized_track[:elevation_gain]).to eq(0)
+ expect(serialized_track[:elevation_loss]).to eq(0)
+ expect(serialized_track[:elevation_max]).to eq(0)
+ expect(serialized_track[:elevation_min]).to eq(0)
+ end
+ end
+
+ context 'with very large values' do
+ let(:track) do
+ create(:track, user: user,
+ distance: 1_000_000.0,
+ avg_speed: 999.99,
+ duration: 86_400, # 24 hours in seconds
+ elevation_gain: 10_000,
+ elevation_loss: 8_000,
+ elevation_max: 5_000,
+ elevation_min: 0)
+ end
+
+ it 'handles large values correctly' do
+ expect(serialized_track[:distance]).to eq(1_000_000)
+ expect(serialized_track[:avg_speed]).to eq(999.99)
+ expect(serialized_track[:duration]).to eq(86_400)
+ expect(serialized_track[:elevation_gain]).to eq(10_000)
+ expect(serialized_track[:elevation_loss]).to eq(8_000)
+ expect(serialized_track[:elevation_max]).to eq(5_000)
+ expect(serialized_track[:elevation_min]).to eq(0)
+ end
+ end
+
+ context 'with different timestamp formats' do
+ let(:start_time) { Time.current }
+ let(:end_time) { start_time + 1.hour }
+ let(:track) { create(:track, user: user, start_at: start_time, end_at: end_time) }
+
+ it 'formats timestamps consistently' do
+ expect(serialized_track[:start_at]).to eq(start_time.iso8601)
+ expect(serialized_track[:end_at]).to eq(end_time.iso8601)
+ end
+ end
+ end
+
+ describe '#initialize' do
+ let(:track) { create(:track) }
+
+ it 'accepts a track parameter' do
+ expect { described_class.new(track) }.not_to raise_error
+ end
+
+ it 'stores the track instance' do
+ serializer = described_class.new(track)
+ expect(serializer.instance_variable_get(:@track)).to eq(track)
+ end
+ end
+end
diff --git a/spec/serializers/tracks_serializer_spec.rb b/spec/serializers/tracks_serializer_spec.rb
new file mode 100644
index 00000000..a4a536b7
--- /dev/null
+++ b/spec/serializers/tracks_serializer_spec.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe TracksSerializer do
+ describe '#call' do
+ let(:user) { create(:user) }
+
+ context 'when serializing user tracks with track IDs' do
+ subject(:serializer) { described_class.new(user, track_ids).call }
+
+ let!(:track1) { create(:track, user: user, start_at: 2.hours.ago, end_at: 1.hour.ago) }
+ let!(:track2) { create(:track, user: user, start_at: 4.hours.ago, end_at: 3.hours.ago) }
+ let!(:track3) { create(:track, user: user, start_at: 6.hours.ago, end_at: 5.hours.ago) }
+ let(:track_ids) { [track1.id, track2.id] }
+
+ it 'returns an array of serialized tracks' do
+ expect(serializer).to be_an(Array)
+ expect(serializer.length).to eq(2)
+ end
+
+ it 'serializes each track correctly' do
+ serialized_ids = serializer.map { |track| track[:id] }
+ expect(serialized_ids).to contain_exactly(track1.id, track2.id)
+ expect(serialized_ids).not_to include(track3.id)
+ end
+
+ it 'formats timestamps as ISO8601 for all tracks' do
+ serializer.each do |track|
+ expect(track[:start_at]).to match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
+ expect(track[:end_at]).to match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
+ end
+ end
+
+ it 'includes all required fields for each track' do
+ serializer.each do |track|
+ expect(track.keys).to contain_exactly(
+ :id, :start_at, :end_at, :distance, :avg_speed, :duration,
+ :elevation_gain, :elevation_loss, :elevation_max, :elevation_min, :original_path
+ )
+ end
+ end
+
+ it 'handles numeric values correctly' do
+ serializer.each do |track|
+ expect(track[:distance]).to be_a(Numeric)
+ expect(track[:avg_speed]).to be_a(Numeric)
+ expect(track[:duration]).to be_a(Numeric)
+ expect(track[:elevation_gain]).to be_a(Numeric)
+ expect(track[:elevation_loss]).to be_a(Numeric)
+ expect(track[:elevation_max]).to be_a(Numeric)
+ expect(track[:elevation_min]).to be_a(Numeric)
+ end
+ end
+
+ it 'orders tracks by start_at in ascending order' do
+ serialized_tracks = serializer
+ expect(serialized_tracks.first[:id]).to eq(track2.id) # Started 4 hours ago
+ expect(serialized_tracks.second[:id]).to eq(track1.id) # Started 2 hours ago
+ end
+ end
+
+ context 'when track IDs belong to different users' do
+ subject(:serializer) { described_class.new(user, track_ids).call }
+
+ let(:other_user) { create(:user) }
+ let!(:user_track) { create(:track, user: user) }
+ let!(:other_user_track) { create(:track, user: other_user) }
+ let(:track_ids) { [user_track.id, other_user_track.id] }
+
+ it 'only returns tracks belonging to the specified user' do
+ serialized_ids = serializer.map { |track| track[:id] }
+ expect(serialized_ids).to contain_exactly(user_track.id)
+ expect(serialized_ids).not_to include(other_user_track.id)
+ end
+ end
+
+ context 'when track IDs array is empty' do
+ subject(:serializer) { described_class.new(user, []).call }
+
+ it 'returns an empty array' do
+ expect(serializer).to eq([])
+ end
+ end
+
+ context 'when track IDs contain non-existent IDs' do
+ subject(:serializer) { described_class.new(user, track_ids).call }
+
+ let!(:existing_track) { create(:track, user: user) }
+ let(:track_ids) { [existing_track.id, 999999] }
+
+ it 'only returns existing tracks' do
+ serialized_ids = serializer.map { |track| track[:id] }
+ expect(serialized_ids).to contain_exactly(existing_track.id)
+ expect(serializer.length).to eq(1)
+ end
+ end
+ end
+end
diff --git a/spec/services/check_app_version_spec.rb b/spec/services/check_app_version_spec.rb
index 1e90b3af..5e2600c4 100644
--- a/spec/services/check_app_version_spec.rb
+++ b/spec/services/check_app_version_spec.rb
@@ -13,6 +13,12 @@ RSpec.describe CheckAppVersion do
stub_const('APP_VERSION', '1.0.0')
end
+ context 'when in production' do
+ before { allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production')) }
+
+ it { is_expected.to be false }
+ end
+
context 'when latest version is newer' do
before { stub_const('APP_VERSION', '0.9.0') }
diff --git a/spec/services/own_tracks/importer_spec.rb b/spec/services/own_tracks/importer_spec.rb
index 0800d0b8..842883f8 100644
--- a/spec/services/own_tracks/importer_spec.rb
+++ b/spec/services/own_tracks/importer_spec.rb
@@ -78,5 +78,19 @@ RSpec.describe OwnTracks::Importer do
expect(Point.first.velocity).to eq('1.4')
end
end
+
+ context 'when file is old' do
+ let(:file_path) { Rails.root.join('spec/fixtures/files/owntracks/2023-02_old.rec') }
+
+ it 'creates points' do
+ expect { parser }.to change { Point.count }.by(9)
+ end
+
+ it 'correctly writes attributes' do
+ parser
+
+ point = Point.first
+ end
+ end
end
end
diff --git a/spec/services/own_tracks/params_spec.rb b/spec/services/own_tracks/params_spec.rb
index d08f5b30..9bea14cc 100644
--- a/spec/services/own_tracks/params_spec.rb
+++ b/spec/services/own_tracks/params_spec.rb
@@ -185,5 +185,13 @@ RSpec.describe OwnTracks::Params do
expect(params[:trigger]).to eq('unknown')
end
end
+
+ context 'when point is invalid' do
+ let(:raw_point_params) { super().merge(lon: nil, lat: nil, tst: nil) }
+
+ it 'returns parsed params' do
+ expect(params).to eq(nil)
+ end
+ end
end
end
diff --git a/spec/services/places/name_fetcher_spec.rb b/spec/services/places/name_fetcher_spec.rb
new file mode 100644
index 00000000..a2e72b76
--- /dev/null
+++ b/spec/services/places/name_fetcher_spec.rb
@@ -0,0 +1,220 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Places::NameFetcher do
+ describe '#call' do
+ subject(:service) { described_class.new(place) }
+
+ let(:place) do
+ create(
+ :place,
+ name: Place::DEFAULT_NAME,
+ city: nil,
+ country: nil,
+ geodata: {},
+ lonlat: 'POINT(10.0 10.0)'
+ )
+ end
+
+ let(:geocoder_result) do
+ double(
+ 'geocoder_result',
+ data: {
+ 'properties' => {
+ 'name' => 'Central Park',
+ 'city' => 'New York',
+ 'country' => 'United States'
+ }
+ }
+ )
+ end
+
+ before do
+ allow(Geocoder).to receive(:search).and_return([geocoder_result])
+ end
+
+ context 'when geocoding is successful' do
+ it 'calls Geocoder with correct parameters' do
+ expect(Geocoder).to receive(:search)
+ .with([place.lat, place.lon], units: :km, limit: 1, distance_sort: true)
+ .and_return([geocoder_result])
+
+ service.call
+ end
+
+ it 'updates place name from geocoder data' do
+ expect { service.call }.to change(place, :name)
+ .from(Place::DEFAULT_NAME)
+ .to('Central Park')
+ end
+
+ it 'updates place city from geocoder data' do
+ expect { service.call }.to change(place, :city)
+ .from(nil)
+ .to('New York')
+ end
+
+ it 'updates place country from geocoder data' do
+ expect { service.call }.to change(place, :country)
+ .from(nil)
+ .to('United States')
+ end
+
+ it 'saves the place' do
+ expect(place).to receive(:save!)
+
+ service.call
+ end
+
+ context 'when DawarichSettings.store_geodata? is enabled' do
+ before do
+ allow(DawarichSettings).to receive(:store_geodata?).and_return(true)
+ end
+
+ it 'stores geodata in the place' do
+ expect { service.call }.to change(place, :geodata)
+ .from({})
+ .to(geocoder_result.data)
+ end
+ end
+
+ context 'when DawarichSettings.store_geodata? is disabled' do
+ before do
+ allow(DawarichSettings).to receive(:store_geodata?).and_return(false)
+ end
+
+ it 'does not store geodata in the place' do
+ expect { service.call }.not_to change(place, :geodata)
+ end
+ end
+
+ context 'when place has visits with default name' do
+ let!(:visit_with_default_name) do
+ create(:visit, name: Place::DEFAULT_NAME)
+ end
+ let!(:visit_with_custom_name) do
+ create(:visit, name: 'Custom Visit Name')
+ end
+
+ before do
+ place.visits << visit_with_default_name
+ place.visits << visit_with_custom_name
+ end
+
+ it 'updates visits with default name to the new place name' do
+ expect { service.call }.to \
+ change { visit_with_default_name.reload.name }
+ .from(Place::DEFAULT_NAME)
+ .to('Central Park')
+ end
+
+ it 'does not update visits with custom names' do
+ expect { service.call }.not_to \
+ change { visit_with_custom_name.reload.name }
+ end
+ end
+
+ context 'when using transactions' do
+ it 'wraps updates in a transaction' do
+ expect(ActiveRecord::Base).to \
+ receive(:transaction).and_call_original
+
+ service.call
+ end
+
+ it 'rolls back changes if save fails' do
+ allow(place).to receive(:save!).and_raise(ActiveRecord::RecordInvalid)
+
+ expect { service.call }.to raise_error(ActiveRecord::RecordInvalid)
+ expect(place.reload.name).to eq(Place::DEFAULT_NAME)
+ end
+ end
+
+ it 'returns the updated place' do
+ result = service.call
+ expect(result).to eq(place)
+ expect(result.name).to eq('Central Park')
+ end
+ end
+
+ context 'when geocoding returns no results' do
+ before do
+ allow(Geocoder).to receive(:search).and_return([])
+ end
+
+ it 'returns nil' do
+ expect(service.call).to be_nil
+ end
+
+ it 'does not update the place' do
+ expect { service.call }.not_to change(place, :name)
+ end
+
+ it 'does not call save on the place' do
+ expect(place).not_to receive(:save!)
+
+ service.call
+ end
+ end
+
+ context 'when geocoding returns nil result' do
+ before do
+ allow(Geocoder).to receive(:search).and_return([nil])
+ end
+
+ it 'returns nil' do
+ expect(service.call).to be_nil
+ end
+
+ it 'does not update the place' do
+ expect { service.call }.not_to change(place, :name)
+ end
+ end
+
+ context 'when geocoder result has missing properties' do
+ let(:incomplete_geocoder_result) do
+ double(
+ 'geocoder_result',
+ data: {
+ 'properties' => {
+ 'name' => 'Partial Place',
+ 'city' => nil,
+ 'country' => 'United States'
+ }
+ }
+ )
+ end
+
+ before do
+ allow(Geocoder).to receive(:search).and_return([incomplete_geocoder_result])
+ end
+
+ it 'updates place with available data' do
+ service.call
+
+ expect(place.name).to eq('Partial Place')
+ expect(place.city).to be_nil
+ expect(place.country).to eq('United States')
+ end
+ end
+
+ context 'when geocoder result has no properties' do
+ let(:no_properties_result) do
+ double('geocoder_result', data: {})
+ end
+
+ before do
+ allow(Geocoder).to receive(:search).and_return([no_properties_result])
+ end
+
+ it 'handles missing properties gracefully' do
+ expect { service.call }.not_to raise_error
+
+ expect(place.name).to eq(Place::DEFAULT_NAME)
+ expect(place.city).to be_nil
+ expect(place.country).to be_nil
+ end
+ end
+ end
+end
diff --git a/spec/services/points_limit_exceeded_spec.rb b/spec/services/points_limit_exceeded_spec.rb
index 8edfcad3..88cd6268 100644
--- a/spec/services/points_limit_exceeded_spec.rb
+++ b/spec/services/points_limit_exceeded_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe PointsLimitExceeded do
context 'when user points count is equal to the limit' do
before do
- allow(user.points).to receive(:count).and_return(10)
+ allow(user.tracked_points).to receive(:count).and_return(10)
end
it { is_expected.to be true }
@@ -32,7 +32,7 @@ RSpec.describe PointsLimitExceeded do
context 'when user points count exceeds the limit' do
before do
- allow(user.points).to receive(:count).and_return(11)
+ allow(user.tracked_points).to receive(:count).and_return(11)
end
it { is_expected.to be true }
@@ -40,7 +40,7 @@ RSpec.describe PointsLimitExceeded do
context 'when user points count is below the limit' do
before do
- allow(user.points).to receive(:count).and_return(9)
+ allow(user.tracked_points).to receive(:count).and_return(9)
end
it { is_expected.to be false }
diff --git a/spec/services/stats/calculate_month_spec.rb b/spec/services/stats/calculate_month_spec.rb
index 83069d08..275c46a9 100644
--- a/spec/services/stats/calculate_month_spec.rb
+++ b/spec/services/stats/calculate_month_spec.rb
@@ -53,15 +53,17 @@ RSpec.describe Stats::CalculateMonth do
lonlat: 'POINT(9.77973105800526 52.72859111523629)')
end
- context 'when units are kilometers' do
+ context 'when calculating distance' do
it 'creates stats' do
expect { calculate_stats }.to change { Stat.count }.by(1)
end
- it 'calculates distance' do
+ it 'calculates distance in meters consistently' do
calculate_stats
- expect(user.stats.last.distance).to eq(339)
+ # Distance should be calculated in meters regardless of user unit preference
+ # The actual distance between the test points is approximately 340 km = 340,000 meters
+ expect(user.stats.last.distance).to be_within(1000).of(340_000)
end
context 'when there is an error' do
@@ -79,33 +81,16 @@ RSpec.describe Stats::CalculateMonth do
end
end
- context 'when units are miles' do
+ context 'when user prefers miles' do
before do
user.update(settings: { maps: { distance_unit: 'mi' } })
end
- it 'creates stats' do
- expect { calculate_stats }.to change { Stat.count }.by(1)
- end
-
- it 'calculates distance' do
+ it 'still stores distance in meters (same as km users)' do
calculate_stats
- expect(user.stats.last.distance).to eq(211)
- end
-
- context 'when there is an error' do
- before do
- allow(Stat).to receive(:find_or_initialize_by).and_raise(StandardError)
- end
-
- it 'does not create stats' do
- expect { calculate_stats }.not_to(change { Stat.count })
- end
-
- it 'creates a notification' do
- expect { calculate_stats }.to change { Notification.count }.by(1)
- end
+ # Distance stored should be the same regardless of user preference (meters)
+ expect(user.stats.last.distance).to be_within(1000).of(340_000)
end
end
end
diff --git a/spec/services/tracks/generator_spec.rb b/spec/services/tracks/generator_spec.rb
new file mode 100644
index 00000000..6f352b86
--- /dev/null
+++ b/spec/services/tracks/generator_spec.rb
@@ -0,0 +1,260 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Tracks::Generator do
+ let(:user) { create(:user) }
+ let(:safe_settings) { user.safe_settings }
+
+ before do
+ allow(user).to receive(:safe_settings).and_return(safe_settings)
+ end
+
+ describe '#call' do
+ context 'with bulk mode' do
+ let(:generator) { described_class.new(user, mode: :bulk) }
+
+ context 'with sufficient points' do
+ let!(:points) { create_points_around(user: user, count: 5, base_lat: 20.0) }
+
+ it 'generates tracks from all points' do
+ expect { generator.call }.to change(Track, :count).by(1)
+ end
+
+ it 'cleans existing tracks' do
+ existing_track = create(:track, user: user)
+ generator.call
+ expect(Track.exists?(existing_track.id)).to be false
+ end
+
+ it 'associates points with created tracks' do
+ generator.call
+ expect(points.map(&:reload).map(&:track)).to all(be_present)
+ end
+
+ it 'properly handles point associations when cleaning existing tracks' do
+ # Create existing tracks with associated points
+ existing_track = create(:track, user: user)
+ existing_points = create_list(:point, 3, user: user, track: existing_track)
+
+ # Verify points are associated
+ expect(existing_points.map(&:reload).map(&:track_id)).to all(eq(existing_track.id))
+
+ # Run generator which should clean existing tracks and create new ones
+ generator.call
+
+ # Verify the old track is deleted
+ expect(Track.exists?(existing_track.id)).to be false
+
+ # Verify the points are no longer associated with the deleted track
+ expect(existing_points.map(&:reload).map(&:track_id)).to all(be_nil)
+ end
+ end
+
+ context 'with insufficient points' do
+ let!(:points) { create_points_around(user: user, count: 1, base_lat: 20.0) }
+
+ it 'does not create tracks' do
+ expect { generator.call }.not_to change(Track, :count)
+ end
+ end
+
+ context 'with time range' do
+ let!(:old_points) { create_points_around(user: user, count: 3, base_lat: 20.0, timestamp: 2.days.ago.to_i) }
+ let!(:new_points) { create_points_around(user: user, count: 3, base_lat: 21.0, timestamp: 1.day.ago.to_i) }
+
+ it 'only processes points within range' do
+ generator = described_class.new(
+ user,
+ start_at: 1.day.ago.beginning_of_day,
+ end_at: 1.day.ago.end_of_day,
+ mode: :bulk
+ )
+
+ generator.call
+ track = Track.last
+ expect(track.points.count).to eq(3)
+ end
+ end
+ end
+
+ context 'with incremental mode' do
+ let(:generator) { described_class.new(user, mode: :incremental) }
+
+ context 'with untracked points' do
+ let!(:points) { create_points_around(user: user, count: 3, base_lat: 22.0, track_id: nil) }
+
+ it 'processes untracked points' do
+ expect { generator.call }.to change(Track, :count).by(1)
+ end
+
+ it 'associates points with created tracks' do
+ generator.call
+ expect(points.map(&:reload).map(&:track)).to all(be_present)
+ end
+ end
+
+ context 'with end_at specified' do
+ let!(:early_points) { create_points_around(user: user, count: 2, base_lat: 23.0, timestamp: 2.hours.ago.to_i) }
+ let!(:late_points) { create_points_around(user: user, count: 2, base_lat: 24.0, timestamp: 1.hour.ago.to_i) }
+
+ it 'only processes points up to end_at' do
+ generator = described_class.new(user, end_at: 1.5.hours.ago, mode: :incremental)
+ generator.call
+
+ expect(Track.count).to eq(1)
+ expect(Track.first.points.count).to eq(2)
+ end
+ end
+
+ context 'without existing tracks' do
+ let!(:points) { create_points_around(user: user, count: 3, base_lat: 25.0) }
+
+ it 'does not clean existing tracks' do
+ existing_track = create(:track, user: user)
+ generator.call
+ expect(Track.exists?(existing_track.id)).to be true
+ end
+ end
+ end
+
+ context 'with daily mode' do
+ let(:today) { Date.current }
+ let(:generator) { described_class.new(user, start_at: today, mode: :daily) }
+
+ let!(:today_points) { create_points_around(user: user, count: 3, base_lat: 26.0, timestamp: today.beginning_of_day.to_i) }
+ let!(:yesterday_points) { create_points_around(user: user, count: 3, base_lat: 27.0, timestamp: 1.day.ago.to_i) }
+
+ it 'only processes points from specified day' do
+ generator.call
+ track = Track.last
+ expect(track.points.count).to eq(3)
+ end
+
+ it 'cleans existing tracks for the day' do
+ existing_track = create(:track, user: user, start_at: today.beginning_of_day)
+ generator.call
+ expect(Track.exists?(existing_track.id)).to be false
+ end
+
+ it 'properly handles point associations when cleaning daily tracks' do
+ # Create existing tracks with associated points for today
+ existing_track = create(:track, user: user, start_at: today.beginning_of_day)
+ existing_points = create_list(:point, 3, user: user, track: existing_track)
+
+ # Verify points are associated
+ expect(existing_points.map(&:reload).map(&:track_id)).to all(eq(existing_track.id))
+
+ # Run generator which should clean existing tracks for the day and create new ones
+ generator.call
+
+ # Verify the old track is deleted
+ expect(Track.exists?(existing_track.id)).to be false
+
+ # Verify the points are no longer associated with the deleted track
+ expect(existing_points.map(&:reload).map(&:track_id)).to all(be_nil)
+ end
+ end
+
+ context 'with empty points' do
+ let(:generator) { described_class.new(user, mode: :bulk) }
+
+ it 'does not create tracks' do
+ expect { generator.call }.not_to change(Track, :count)
+ end
+ end
+
+ context 'with threshold configuration' do
+ let(:generator) { described_class.new(user, mode: :bulk) }
+
+ before do
+ allow(safe_settings).to receive(:meters_between_routes).and_return(1000)
+ allow(safe_settings).to receive(:minutes_between_routes).and_return(90)
+ end
+
+ it 'uses configured thresholds' do
+ expect(generator.send(:distance_threshold_meters)).to eq(1000)
+ expect(generator.send(:time_threshold_minutes)).to eq(90)
+ end
+ end
+
+ context 'with invalid mode' do
+ it 'raises argument error' do
+ expect do
+ described_class.new(user, mode: :invalid).call
+ end.to raise_error(ArgumentError, /Unknown mode/)
+ end
+ end
+ end
+
+ describe 'segmentation behavior' do
+ let(:generator) { described_class.new(user, mode: :bulk) }
+
+ context 'with points exceeding time threshold' do
+ let!(:points) do
+ [
+ create_points_around(user: user, count: 1, base_lat: 29.0, timestamp: 90.minutes.ago.to_i),
+ create_points_around(user: user, count: 1, base_lat: 29.0, timestamp: 60.minutes.ago.to_i),
+ # Gap exceeds threshold 👇👇👇
+ create_points_around(user: user, count: 1, base_lat: 29.0, timestamp: 10.minutes.ago.to_i),
+ create_points_around(user: user, count: 1, base_lat: 29.0, timestamp: Time.current.to_i)
+ ]
+ end
+
+ before do
+ allow(safe_settings).to receive(:minutes_between_routes).and_return(45)
+ end
+
+ it 'creates separate tracks for segments' do
+ expect { generator.call }.to change(Track, :count).by(2)
+ end
+ end
+
+ context 'with points exceeding distance threshold' do
+ let!(:points) do
+ [
+ create_points_around(user: user, count: 2, base_lat: 29.0, timestamp: 20.minutes.ago.to_i),
+ create_points_around(user: user, count: 2, base_lat: 29.0, timestamp: 15.minutes.ago.to_i),
+ # Large distance jump 👇👇👇
+ create_points_around(user: user, count: 2, base_lat: 28.0, timestamp: 10.minutes.ago.to_i),
+ create_points_around(user: user, count: 1, base_lat: 28.0, timestamp: Time.current.to_i)
+ ]
+ end
+
+ before do
+ allow(safe_settings).to receive(:meters_between_routes).and_return(200)
+ end
+
+ it 'creates separate tracks for segments' do
+ expect { generator.call }.to change(Track, :count).by(2)
+ end
+ end
+ end
+
+ describe 'deterministic behavior' do
+ let!(:points) { create_points_around(user: user, count: 10, base_lat: 28.0) }
+
+ it 'produces same results for bulk and incremental modes' do
+ # Generate tracks in bulk mode
+ bulk_generator = described_class.new(user, mode: :bulk)
+ bulk_generator.call
+ bulk_tracks = user.tracks.order(:start_at).to_a
+
+ # Clear tracks and generate incrementally
+ user.tracks.destroy_all
+ incremental_generator = described_class.new(user, mode: :incremental)
+ incremental_generator.call
+ incremental_tracks = user.tracks.order(:start_at).to_a
+
+ # Should have same number of tracks
+ expect(incremental_tracks.size).to eq(bulk_tracks.size)
+
+ # Should have same track boundaries (allowing for small timing differences)
+ bulk_tracks.zip(incremental_tracks).each do |bulk_track, incremental_track|
+ expect(incremental_track.start_at).to be_within(1.second).of(bulk_track.start_at)
+ expect(incremental_track.end_at).to be_within(1.second).of(bulk_track.end_at)
+ expect(incremental_track.distance).to be_within(10).of(bulk_track.distance)
+ end
+ end
+ end
+end
diff --git a/spec/services/tracks/incremental_processor_spec.rb b/spec/services/tracks/incremental_processor_spec.rb
new file mode 100644
index 00000000..165af52d
--- /dev/null
+++ b/spec/services/tracks/incremental_processor_spec.rb
@@ -0,0 +1,249 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Tracks::IncrementalProcessor do
+ let(:user) { create(:user) }
+ let(:safe_settings) { user.safe_settings }
+
+ before do
+ allow(user).to receive(:safe_settings).and_return(safe_settings)
+ allow(safe_settings).to receive(:minutes_between_routes).and_return(30)
+ allow(safe_settings).to receive(:meters_between_routes).and_return(500)
+ end
+
+ describe '#call' do
+ context 'with imported points' do
+ let(:imported_point) { create(:point, user: user, import: create(:import)) }
+ let(:processor) { described_class.new(user, imported_point) }
+
+ it 'does not process imported points' do
+ expect(Tracks::CreateJob).not_to receive(:perform_later)
+
+ processor.call
+ end
+ end
+
+ context 'with first point for user' do
+ let(:new_point) { create(:point, user: user) }
+ let(:processor) { described_class.new(user, new_point) }
+
+ it 'processes first point' do
+ expect(Tracks::CreateJob).to receive(:perform_later)
+ .with(user.id, start_at: nil, end_at: nil, mode: :incremental)
+ processor.call
+ end
+ end
+
+ context 'with thresholds exceeded' do
+ let(:previous_point) { create(:point, user: user, timestamp: 1.hour.ago.to_i) }
+ let(:new_point) { create(:point, user: user, timestamp: Time.current.to_i) }
+ let(:processor) { described_class.new(user, new_point) }
+
+ before do
+ # Create previous point first
+ previous_point
+ end
+
+ it 'processes when time threshold exceeded' do
+ expect(Tracks::CreateJob).to receive(:perform_later)
+ .with(user.id, start_at: nil, end_at: Time.zone.at(previous_point.timestamp), mode: :incremental)
+ processor.call
+ end
+ end
+
+ context 'with existing tracks' do
+ let(:existing_track) { create(:track, user: user, end_at: 2.hours.ago) }
+ let(:previous_point) { create(:point, user: user, timestamp: 1.hour.ago.to_i) }
+ let(:new_point) { create(:point, user: user, timestamp: Time.current.to_i) }
+ let(:processor) { described_class.new(user, new_point) }
+
+ before do
+ existing_track
+ previous_point
+ end
+
+ it 'uses existing track end time as start_at' do
+ expect(Tracks::CreateJob).to receive(:perform_later)
+ .with(user.id, start_at: existing_track.end_at, end_at: Time.zone.at(previous_point.timestamp), mode: :incremental)
+ processor.call
+ end
+ end
+
+ context 'with distance threshold exceeded' do
+ let(:previous_point) do
+ create(:point, user: user, timestamp: 10.minutes.ago.to_i, lonlat: 'POINT(0 0)')
+ end
+ let(:new_point) do
+ create(:point, user: user, timestamp: Time.current.to_i, lonlat: 'POINT(1 1)')
+ end
+ let(:processor) { described_class.new(user, new_point) }
+
+ before do
+ # Create previous point first
+ previous_point
+ # Mock distance calculation to exceed threshold
+ allow_any_instance_of(Point).to receive(:distance_to).and_return(1.0) # 1 km = 1000m
+ end
+
+ it 'processes when distance threshold exceeded' do
+ expect(Tracks::CreateJob).to receive(:perform_later)
+ .with(user.id, start_at: nil, end_at: Time.zone.at(previous_point.timestamp), mode: :incremental)
+ processor.call
+ end
+ end
+
+ context 'with thresholds not exceeded' do
+ let(:previous_point) { create(:point, user: user, timestamp: 10.minutes.ago.to_i) }
+ let(:new_point) { create(:point, user: user, timestamp: Time.current.to_i) }
+ let(:processor) { described_class.new(user, new_point) }
+
+ before do
+ # Create previous point first
+ previous_point
+ # Mock distance to be within threshold
+ allow_any_instance_of(Point).to receive(:distance_to).and_return(0.1) # 100m
+ end
+
+ it 'does not process when thresholds not exceeded' do
+ expect(Tracks::CreateJob).not_to receive(:perform_later)
+ processor.call
+ end
+ end
+ end
+
+ describe '#should_process?' do
+ let(:processor) { described_class.new(user, new_point) }
+
+ context 'with imported point' do
+ let(:new_point) { create(:point, user: user, import: create(:import)) }
+
+ it 'returns false' do
+ expect(processor.send(:should_process?)).to be false
+ end
+ end
+
+ context 'with first point for user' do
+ let(:new_point) { create(:point, user: user) }
+
+ it 'returns true' do
+ expect(processor.send(:should_process?)).to be true
+ end
+ end
+
+ context 'with thresholds exceeded' do
+ let(:previous_point) { create(:point, user: user, timestamp: 1.hour.ago.to_i) }
+ let(:new_point) { create(:point, user: user, timestamp: Time.current.to_i) }
+
+ before do
+ previous_point # Create previous point
+ end
+
+ it 'returns true when time threshold exceeded' do
+ expect(processor.send(:should_process?)).to be true
+ end
+ end
+
+ context 'with thresholds not exceeded' do
+ let(:previous_point) { create(:point, user: user, timestamp: 10.minutes.ago.to_i) }
+ let(:new_point) { create(:point, user: user, timestamp: Time.current.to_i) }
+
+ before do
+ previous_point # Create previous point
+ allow_any_instance_of(Point).to receive(:distance_to).and_return(0.1) # 100m
+ end
+
+ it 'returns false when thresholds not exceeded' do
+ expect(processor.send(:should_process?)).to be false
+ end
+ end
+ end
+
+ describe '#exceeds_thresholds?' do
+ let(:processor) { described_class.new(user, new_point) }
+ let(:previous_point) { create(:point, user: user, timestamp: 1.hour.ago.to_i) }
+ let(:new_point) { create(:point, user: user, timestamp: Time.current.to_i) }
+
+ context 'with time threshold exceeded' do
+ before do
+ allow(safe_settings).to receive(:minutes_between_routes).and_return(30)
+ end
+
+ it 'returns true' do
+ result = processor.send(:exceeds_thresholds?, previous_point, new_point)
+ expect(result).to be true
+ end
+ end
+
+ context 'with distance threshold exceeded' do
+ before do
+ allow(safe_settings).to receive(:minutes_between_routes).and_return(120) # 2 hours
+ allow(safe_settings).to receive(:meters_between_routes).and_return(400)
+ allow_any_instance_of(Point).to receive(:distance_to).and_return(0.5) # 500m
+ end
+
+ it 'returns true' do
+ result = processor.send(:exceeds_thresholds?, previous_point, new_point)
+ expect(result).to be true
+ end
+ end
+
+ context 'with neither threshold exceeded' do
+ before do
+ allow(safe_settings).to receive(:minutes_between_routes).and_return(120) # 2 hours
+ allow(safe_settings).to receive(:meters_between_routes).and_return(600)
+ allow_any_instance_of(Point).to receive(:distance_to).and_return(0.1) # 100m
+ end
+
+ it 'returns false' do
+ result = processor.send(:exceeds_thresholds?, previous_point, new_point)
+ expect(result).to be false
+ end
+ end
+ end
+
+ describe '#time_difference_minutes' do
+ let(:processor) { described_class.new(user, new_point) }
+ let(:point1) { create(:point, user: user, timestamp: 1.hour.ago.to_i) }
+ let(:point2) { create(:point, user: user, timestamp: Time.current.to_i) }
+ let(:new_point) { point2 }
+
+ it 'calculates time difference in minutes' do
+ result = processor.send(:time_difference_minutes, point1, point2)
+ expect(result).to be_within(1).of(60) # Approximately 60 minutes
+ end
+ end
+
+ describe '#distance_difference_meters' do
+ let(:processor) { described_class.new(user, new_point) }
+ let(:point1) { create(:point, user: user) }
+ let(:point2) { create(:point, user: user) }
+ let(:new_point) { point2 }
+
+ before do
+ allow(point1).to receive(:distance_to).with(point2).and_return(1.5) # 1.5 km
+ end
+
+ it 'calculates distance difference in meters' do
+ result = processor.send(:distance_difference_meters, point1, point2)
+ expect(result).to eq(1500) # 1.5 km = 1500 m
+ end
+ end
+
+ describe 'threshold configuration' do
+ let(:processor) { described_class.new(user, create(:point, user: user)) }
+
+ before do
+ allow(safe_settings).to receive(:minutes_between_routes).and_return(45)
+ allow(safe_settings).to receive(:meters_between_routes).and_return(750)
+ end
+
+ it 'uses configured time threshold' do
+ expect(processor.send(:time_threshold_minutes)).to eq(45)
+ end
+
+ it 'uses configured distance threshold' do
+ expect(processor.send(:distance_threshold_meters)).to eq(750)
+ end
+ end
+end
diff --git a/spec/services/tracks/track_builder_spec.rb b/spec/services/tracks/track_builder_spec.rb
new file mode 100644
index 00000000..5046e60f
--- /dev/null
+++ b/spec/services/tracks/track_builder_spec.rb
@@ -0,0 +1,326 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Tracks::TrackBuilder do
+ # Create a test class that includes the concern for testing
+ let(:test_class) do
+ Class.new do
+ include Tracks::TrackBuilder
+
+ def initialize(user)
+ @user = user
+ end
+
+ private
+
+ attr_reader :user
+ end
+ end
+
+ let(:user) { create(:user) }
+ let(:builder) { test_class.new(user) }
+
+ before do
+ # Set up user settings for consistent testing
+ allow_any_instance_of(Users::SafeSettings).to receive(:distance_unit).and_return('km')
+ end
+
+ describe '#create_track_from_points' do
+ context 'with valid points' do
+ let!(:points) do
+ [
+ create(:point, user: user, lonlat: 'POINT(-74.0060 40.7128)',
+ timestamp: 2.hours.ago.to_i, altitude: 100),
+ create(:point, user: user, lonlat: 'POINT(-74.0070 40.7130)',
+ timestamp: 1.hour.ago.to_i, altitude: 110),
+ create(:point, user: user, lonlat: 'POINT(-74.0080 40.7132)',
+ timestamp: 30.minutes.ago.to_i, altitude: 105)
+ ]
+ end
+
+ it 'creates a track with correct attributes' do
+ track = builder.create_track_from_points(points)
+
+ expect(track).to be_persisted
+ expect(track.user).to eq(user)
+ expect(track.start_at).to be_within(1.second).of(Time.zone.at(points.first.timestamp))
+ expect(track.end_at).to be_within(1.second).of(Time.zone.at(points.last.timestamp))
+ expect(track.distance).to be > 0
+ expect(track.duration).to eq(90.minutes.to_i)
+ expect(track.avg_speed).to be > 0
+ expect(track.original_path).to be_present
+ end
+
+ it 'calculates elevation statistics correctly' do
+ track = builder.create_track_from_points(points)
+
+ expect(track.elevation_gain).to eq(10) # 110 - 100
+ expect(track.elevation_loss).to eq(5) # 110 - 105
+ expect(track.elevation_max).to eq(110)
+ expect(track.elevation_min).to eq(100)
+ end
+
+ it 'associates points with the track' do
+ track = builder.create_track_from_points(points)
+
+ points.each(&:reload)
+ expect(points.map(&:track)).to all(eq(track))
+ end
+ end
+
+ context 'with insufficient points' do
+ let(:single_point) { [create(:point, user: user)] }
+
+ it 'returns nil for single point' do
+ result = builder.create_track_from_points(single_point)
+ expect(result).to be_nil
+ end
+
+ it 'returns nil for empty array' do
+ result = builder.create_track_from_points([])
+ expect(result).to be_nil
+ end
+ end
+
+ context 'when track save fails' do
+ let(:points) do
+ [
+ create(:point, user: user, timestamp: 1.hour.ago.to_i),
+ create(:point, user: user, timestamp: 30.minutes.ago.to_i)
+ ]
+ end
+
+ before do
+ allow_any_instance_of(Track).to receive(:save).and_return(false)
+ end
+
+ it 'returns nil and logs error' do
+ expect(Rails.logger).to receive(:error).with(
+ /Failed to create track for user #{user.id}/
+ )
+
+ result = builder.create_track_from_points(points)
+ expect(result).to be_nil
+ end
+ end
+ end
+
+ describe '#build_path' do
+ let(:points) do
+ [
+ create(:point, lonlat: 'POINT(-74.0060 40.7128)'),
+ create(:point, lonlat: 'POINT(-74.0070 40.7130)')
+ ]
+ end
+
+ it 'builds path using Tracks::BuildPath service' do
+ expect(Tracks::BuildPath).to receive(:new).with(
+ points
+ ).and_call_original
+
+ result = builder.build_path(points)
+ expect(result).to respond_to(:as_text)
+ end
+ end
+
+ describe '#calculate_track_distance' do
+ let(:points) do
+ [
+ create(:point, user: user, lonlat: 'POINT(-74.0060 40.7128)'),
+ create(:point, user: user, lonlat: 'POINT(-74.0070 40.7130)')
+ ]
+ end
+
+ before do
+ # Mock Point.total_distance to return distance in meters
+ allow(Point).to receive(:total_distance).and_return(1500) # 1500 meters
+ end
+
+ it 'stores distance in meters regardless of user unit preference' do
+ result = builder.calculate_track_distance(points)
+ expect(result).to eq(1500) # Always stored as meters
+ end
+
+ it 'rounds distance to nearest meter' do
+ allow(Point).to receive(:total_distance).and_return(1500.7)
+ result = builder.calculate_track_distance(points)
+ expect(result).to eq(1501) # Rounded to nearest meter
+ end
+ end
+
+ describe '#calculate_duration' do
+ let(:start_time) { 2.hours.ago.to_i }
+ let(:end_time) { 1.hour.ago.to_i }
+ let(:points) do
+ [
+ double(timestamp: start_time),
+ double(timestamp: end_time)
+ ]
+ end
+
+ it 'calculates duration in seconds' do
+ result = builder.calculate_duration(points)
+ expect(result).to eq(1.hour.to_i)
+ end
+ end
+
+ describe '#calculate_average_speed' do
+ context 'with valid distance and duration' do
+ it 'calculates speed in km/h' do
+ distance_meters = 1000 # 1 km
+ duration_seconds = 3600 # 1 hour
+
+ result = builder.calculate_average_speed(distance_meters, duration_seconds)
+ expect(result).to eq(1.0) # 1 km/h
+ end
+
+ it 'rounds to 2 decimal places' do
+ distance_meters = 1500 # 1.5 km
+ duration_seconds = 1800 # 30 minutes
+
+ result = builder.calculate_average_speed(distance_meters, duration_seconds)
+ expect(result).to eq(3.0) # 3 km/h
+ end
+ end
+
+ context 'with invalid inputs' do
+ it 'returns 0.0 for zero duration' do
+ result = builder.calculate_average_speed(1000, 0)
+ expect(result).to eq(0.0)
+ end
+
+ it 'returns 0.0 for zero distance' do
+ result = builder.calculate_average_speed(0, 3600)
+ expect(result).to eq(0.0)
+ end
+
+ it 'returns 0.0 for negative duration' do
+ result = builder.calculate_average_speed(1000, -3600)
+ expect(result).to eq(0.0)
+ end
+ end
+ end
+
+ describe '#calculate_elevation_stats' do
+ context 'with elevation data' do
+ let(:points) do
+ [
+ double(altitude: 100),
+ double(altitude: 150),
+ double(altitude: 120),
+ double(altitude: 180),
+ double(altitude: 160)
+ ]
+ end
+
+ it 'calculates elevation gain correctly' do
+ result = builder.calculate_elevation_stats(points)
+ expect(result[:gain]).to eq(110) # (150-100) + (180-120) = 50 + 60 = 110
+ end
+
+ it 'calculates elevation loss correctly' do
+ result = builder.calculate_elevation_stats(points)
+ expect(result[:loss]).to eq(50) # (150-120) + (180-160) = 30 + 20 = 50
+ end
+
+ it 'finds max elevation' do
+ result = builder.calculate_elevation_stats(points)
+ expect(result[:max]).to eq(180)
+ end
+
+ it 'finds min elevation' do
+ result = builder.calculate_elevation_stats(points)
+ expect(result[:min]).to eq(100)
+ end
+ end
+
+ context 'with no elevation data' do
+ let(:points) do
+ [
+ double(altitude: nil),
+ double(altitude: nil)
+ ]
+ end
+
+ it 'returns default elevation stats' do
+ result = builder.calculate_elevation_stats(points)
+ expect(result).to eq({
+ gain: 0,
+ loss: 0,
+ max: 0,
+ min: 0
+ })
+ end
+ end
+
+ context 'with mixed elevation data' do
+ let(:points) do
+ [
+ double(altitude: 100),
+ double(altitude: nil),
+ double(altitude: 150)
+ ]
+ end
+
+ it 'ignores nil values' do
+ result = builder.calculate_elevation_stats(points)
+ expect(result[:gain]).to eq(50) # 150 - 100
+ expect(result[:loss]).to eq(0)
+ expect(result[:max]).to eq(150)
+ expect(result[:min]).to eq(100)
+ end
+ end
+ end
+
+ describe '#default_elevation_stats' do
+ it 'returns hash with zero values' do
+ result = builder.default_elevation_stats
+ expect(result).to eq({
+ gain: 0,
+ loss: 0,
+ max: 0,
+ min: 0
+ })
+ end
+ end
+
+ describe 'user method requirement' do
+ let(:invalid_class) do
+ Class.new do
+ include Tracks::TrackBuilder
+ # Does not implement user method
+ end
+ end
+
+ it 'raises NotImplementedError when user method is not implemented' do
+ invalid_builder = invalid_class.new
+ expect { invalid_builder.send(:user) }.to raise_error(
+ NotImplementedError,
+ "Including class must implement user method"
+ )
+ end
+ end
+
+ describe 'integration test' do
+ let!(:points) do
+ [
+ create(:point, user: user, lonlat: 'POINT(-74.0060 40.7128)',
+ timestamp: 2.hours.ago.to_i, altitude: 100),
+ create(:point, user: user, lonlat: 'POINT(-74.0070 40.7130)',
+ timestamp: 1.hour.ago.to_i, altitude: 120)
+ ]
+ end
+
+ it 'creates a complete track end-to-end' do
+ expect { builder.create_track_from_points(points) }.to change(Track, :count).by(1)
+
+ track = Track.last
+ expect(track.user).to eq(user)
+ expect(track.points).to match_array(points)
+ expect(track.distance).to be > 0
+ expect(track.duration).to eq(1.hour.to_i)
+ expect(track.elevation_gain).to eq(20)
+ end
+ end
+end
diff --git a/spec/services/users/import_data_spec.rb b/spec/services/users/import_data_spec.rb
index 5d57b97f..1fcf9cfd 100644
--- a/spec/services/users/import_data_spec.rb
+++ b/spec/services/users/import_data_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Users::ImportData, type: :service do
let(:import_directory) { Rails.root.join('tmp', "import_#{user.email.gsub(/[^0-9A-Za-z._-]/, '_')}_1234567890") }
before do
- allow(Time).to receive(:current).and_return(Time.at(1234567890))
+ allow(Time).to receive(:current).and_return(Time.zone.at(1234567890))
allow(FileUtils).to receive(:mkdir_p)
allow(FileUtils).to receive(:rm_rf)
allow(File).to receive(:directory?).and_return(true)
diff --git a/spec/services/users/safe_settings_spec.rb b/spec/services/users/safe_settings_spec.rb
index ee18406b..573009c9 100644
--- a/spec/services/users/safe_settings_spec.rb
+++ b/spec/services/users/safe_settings_spec.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require 'rails_helper'
+
RSpec.describe Users::SafeSettings do
describe '#default_settings' do
context 'with default values' do
@@ -24,7 +26,10 @@ RSpec.describe Users::SafeSettings do
photoprism_url: nil,
photoprism_api_key: nil,
maps: { "distance_unit" => "km" },
- distance_unit: 'km'
+ distance_unit: 'km',
+ visits_suggestions_enabled: true,
+ speed_color_scale: nil,
+ fog_of_war_threshold: nil
}
)
end
@@ -47,7 +52,8 @@ RSpec.describe Users::SafeSettings do
'immich_api_key' => 'immich-key',
'photoprism_url' => 'https://photoprism.example.com',
'photoprism_api_key' => 'photoprism-key',
- 'maps' => { 'name' => 'custom', 'url' => 'https://custom.example.com' }
+ 'maps' => { 'name' => 'custom', 'url' => 'https://custom.example.com' },
+ 'visits_suggestions_enabled' => false
}
end
let(:safe_settings) { described_class.new(settings) }
@@ -69,7 +75,34 @@ RSpec.describe Users::SafeSettings do
"immich_api_key" => "immich-key",
"photoprism_url" => "https://photoprism.example.com",
"photoprism_api_key" => "photoprism-key",
- "maps" => { "name" => "custom", "url" => "https://custom.example.com" }
+ "maps" => { "name" => "custom", "url" => "https://custom.example.com" },
+ "visits_suggestions_enabled" => false
+ }
+ )
+ end
+
+ it 'returns custom default_settings configuration' do
+ expect(safe_settings.default_settings).to eq(
+ {
+ fog_of_war_meters: 100,
+ meters_between_routes: 1000,
+ preferred_map_layer: "Satellite",
+ speed_colored_routes: true,
+ points_rendering_mode: "simplified",
+ minutes_between_routes: 60,
+ time_threshold_minutes: 45,
+ merge_threshold_minutes: 20,
+ live_map_enabled: false,
+ route_opacity: 80,
+ immich_url: "https://immich.example.com",
+ immich_api_key: "immich-key",
+ photoprism_url: "https://photoprism.example.com",
+ photoprism_api_key: "photoprism-key",
+ maps: { "name" => "custom", "url" => "https://custom.example.com" },
+ distance_unit: nil,
+ visits_suggestions_enabled: false,
+ speed_color_scale: nil,
+ fog_of_war_threshold: nil
}
)
end
@@ -98,6 +131,7 @@ RSpec.describe Users::SafeSettings do
expect(safe_settings.photoprism_url).to be_nil
expect(safe_settings.photoprism_api_key).to be_nil
expect(safe_settings.maps).to eq({ "distance_unit" => "km" })
+ expect(safe_settings.visits_suggestions_enabled?).to be true
end
end
@@ -118,7 +152,8 @@ RSpec.describe Users::SafeSettings do
'immich_api_key' => 'immich-key',
'photoprism_url' => 'https://photoprism.example.com',
'photoprism_api_key' => 'photoprism-key',
- 'maps' => { 'name' => 'custom', 'url' => 'https://custom.example.com' }
+ 'maps' => { 'name' => 'custom', 'url' => 'https://custom.example.com' },
+ 'visits_suggestions_enabled' => false
}
end
@@ -138,6 +173,7 @@ RSpec.describe Users::SafeSettings do
expect(safe_settings.photoprism_url).to eq('https://photoprism.example.com')
expect(safe_settings.photoprism_api_key).to eq('photoprism-key')
expect(safe_settings.maps).to eq({ 'name' => 'custom', 'url' => 'https://custom.example.com' })
+ expect(safe_settings.visits_suggestions_enabled?).to be false
end
end
end
diff --git a/spec/services/visits/suggest_spec.rb b/spec/services/visits/suggest_spec.rb
index 14e7c1dd..4a6df048 100644
--- a/spec/services/visits/suggest_spec.rb
+++ b/spec/services/visits/suggest_spec.rb
@@ -8,29 +8,7 @@ RSpec.describe Visits::Suggest do
let(:start_at) { Time.zone.local(2020, 1, 1, 0, 0, 0) }
let(:end_at) { Time.zone.local(2020, 1, 1, 2, 0, 0) }
- let!(:points) do
- [
- # first visit
- create(:point, :with_known_location, user:, timestamp: start_at),
- create(:point, :with_known_location, user:, timestamp: start_at + 5.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 10.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 15.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 20.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 25.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 30.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 35.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 40.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 45.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 50.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 55.minutes),
- # end of first visit
- # second visit
- create(:point, :with_known_location, user:, timestamp: start_at + 95.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 100.minutes),
- create(:point, :with_known_location, user:, timestamp: start_at + 105.minutes)
- # end of second visit
- ]
- end
+ let!(:points) { create_visit_points(user, start_at) }
let(:geocoder_struct) do
Struct.new(:data) do
@@ -97,12 +75,22 @@ RSpec.describe Visits::Suggest do
end
context 'when reverse geocoding is enabled' do
+ let(:reverse_geocoding_start_at) { Time.zone.local(2020, 6, 1, 0, 0, 0) }
+ let(:reverse_geocoding_end_at) { Time.zone.local(2020, 6, 1, 2, 0, 0) }
+
before do
allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true)
+
+ create_visit_points(user, reverse_geocoding_start_at)
+ clear_enqueued_jobs
end
- it 'reverse geocodes visits' do
- expect { subject }.to have_enqueued_job(ReverseGeocodingJob).exactly(2).times
+ it 'enqueues reverse geocoding jobs for created visits' do
+ described_class.new(user, start_at: reverse_geocoding_start_at, end_at: reverse_geocoding_end_at).call
+
+ expect(enqueued_jobs.count).to eq(2)
+ expect(enqueued_jobs).to all(have_job_class('ReverseGeocodingJob'))
+ expect(enqueued_jobs).to all(have_arguments_starting_with('place'))
end
end
@@ -113,9 +101,51 @@ RSpec.describe Visits::Suggest do
it 'does not reverse geocode visits' do
expect_any_instance_of(Visit).not_to receive(:async_reverse_geocode)
-
subject
end
end
end
+
+ private
+
+ def create_visit_points(user, start_time)
+ [
+ # first visit
+ create(:point, :with_known_location, user:, timestamp: start_time),
+ create(:point, :with_known_location, user:, timestamp: start_time + 5.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 10.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 15.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 20.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 25.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 30.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 35.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 40.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 45.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 50.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 55.minutes),
+ # end of first visit
+
+ # second visit
+ create(:point, :with_known_location, user:, timestamp: start_time + 95.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 100.minutes),
+ create(:point, :with_known_location, user:, timestamp: start_time + 105.minutes)
+ # end of second visit
+ ]
+ end
+
+ def clear_enqueued_jobs
+ ActiveJob::Base.queue_adapter.enqueued_jobs.clear
+ end
+
+ def enqueued_jobs
+ ActiveJob::Base.queue_adapter.enqueued_jobs
+ end
+
+ def have_job_class(job_class)
+ satisfy { |job| job['job_class'] == job_class }
+ end
+
+ def have_arguments_starting_with(first_argument)
+ satisfy { |job| job['arguments'].first == first_argument }
+ end
end
diff --git a/spec/support/devise.rb b/spec/support/devise.rb
index 5d8bf8de..a07f0af9 100644
--- a/spec/support/devise.rb
+++ b/spec/support/devise.rb
@@ -1,22 +1,15 @@
# frozen_string_literal: true
-# https://makandracards.com/makandra/37161-rspec-devise-how-to-sign-in-users-in-request-specs
-
-module DeviseRequestSpecHelpers
- include Warden::Test::Helpers
-
- def sign_in(resource_or_scope, resource = nil)
- resource ||= resource_or_scope
- scope = Devise::Mapping.find_scope!(resource_or_scope)
- login_as(resource, scope:)
- end
-
- def sign_out(resource_or_scope)
- scope = Devise::Mapping.find_scope!(resource_or_scope)
- logout(scope)
- end
-end
+# Standard Devise test helpers configuration for request specs
RSpec.configure do |config|
- config.include DeviseRequestSpecHelpers, type: :request
+ config.include Devise::Test::IntegrationHelpers, type: :request
+ config.include Devise::Test::IntegrationHelpers, type: :system
+
+ # Ensure Devise routes are loaded before request specs
+ config.before(:each, type: :request) do
+ # Reload routes to ensure Devise mappings are available
+ Rails.application.reload_routes! unless @routes_reloaded
+ @routes_reloaded = true
+ end
end
diff --git a/spec/support/point_helpers.rb b/spec/support/point_helpers.rb
new file mode 100644
index 00000000..3e6b45c7
--- /dev/null
+++ b/spec/support/point_helpers.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module PointHelpers
+ # Creates a list of points spaced ~100m apart northwards
+ def create_points_around(user:, count:, base_lat: 20.0, base_lon: 10.0, timestamp: nil, **attrs)
+ Array.new(count) do |i|
+ create(
+ :point,
+ user: user,
+ timestamp: (timestamp.respond_to?(:call) ? timestamp.call(i) : timestamp) || (Time.current - i.minutes).to_i,
+ lonlat: "POINT(#{base_lon} #{base_lat + i * 0.0009})",
+ **attrs
+ )
+ end
+ end
+end
+
+RSpec.configure do |config|
+ config.include PointHelpers
+end
diff --git a/spec/support/redis.rb b/spec/support/redis.rb
new file mode 100644
index 00000000..d473b269
--- /dev/null
+++ b/spec/support/redis.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+ config.before(:each) do
+ Rails.cache.clear
+ end
+end
diff --git a/spec/support/system_helpers.rb b/spec/support/system_helpers.rb
index 2c7cf3ff..9418e8b6 100644
--- a/spec/support/system_helpers.rb
+++ b/spec/support/system_helpers.rb
@@ -1,8 +1,11 @@
# frozen_string_literal: true
module SystemHelpers
+ include Rails.application.routes.url_helpers
+
def sign_in_user(user, password = 'password123')
- visit new_user_session_path
+ visit '/users/sign_in'
+ expect(page).to have_field('Email', wait: 10)
fill_in 'Email', with: user.email
fill_in 'Password', with: password
click_button 'Log in'
@@ -10,11 +13,12 @@ module SystemHelpers
def sign_in_and_visit_map(user, password = 'password123')
sign_in_user(user, password)
- expect(page).to have_current_path(map_path)
+ expect(page).to have_current_path('/map')
expect(page).to have_css('.leaflet-container', wait: 10)
end
end
RSpec.configure do |config|
config.include SystemHelpers, type: :system
+ config.include Rails.application.routes.url_helpers, type: :system
end
diff --git a/spec/swagger/api/v1/countries/visited_cities_spec.rb b/spec/swagger/api/v1/countries/visited_cities_spec.rb
index 61a7fa43..b0de92d8 100644
--- a/spec/swagger/api/v1/countries/visited_cities_spec.rb
+++ b/spec/swagger/api/v1/countries/visited_cities_spec.rb
@@ -17,16 +17,20 @@ RSpec.describe 'Api::V1::Countries::VisitedCities', type: :request do
description: 'Your API authentication key'
parameter name: :start_at,
in: :query,
- type: :string,
- format: 'date-time',
+ schema: {
+ type: :string,
+ format: :date
+ },
required: true,
description: 'Start date in YYYY-MM-DD format',
example: '2023-01-01'
parameter name: :end_at,
in: :query,
- type: :string,
- format: 'date-time',
+ schema: {
+ type: :string,
+ format: :date
+ },
required: true,
description: 'End date in YYYY-MM-DD format',
example: '2023-12-31'
diff --git a/spec/swagger/api/v1/health_controller_spec.rb b/spec/swagger/api/v1/health_controller_spec.rb
index 7305521f..b395fd24 100644
--- a/spec/swagger/api/v1/health_controller_spec.rb
+++ b/spec/swagger/api/v1/health_controller_spec.rb
@@ -14,14 +14,18 @@ describe 'Health API', type: :request do
}
header 'X-Dawarich-Response',
- type: :string,
+ schema: {
+ type: :string,
+ example: 'Hey, I\'m alive!'
+ },
required: true,
- example: 'Hey, I\'m alive!',
description: "Depending on the authentication status of the request, the response will be different. If the request is authenticated, the response will be 'Hey, I'm alive and authenticated!'. If the request is not authenticated, the response will be 'Hey, I'm alive!'."
header 'X-Dawarich-Version',
- type: :string,
+ schema: {
+ type: :string,
+ example: '1.0.0'
+ },
required: true,
- example: '1.0.0',
description: 'The version of the application, for example: 1.0.0'
run_test!
diff --git a/spec/swagger/api/v1/overland/batches_controller_spec.rb b/spec/swagger/api/v1/overland/batches_controller_spec.rb
index 4ba2e0d3..b626c56f 100644
--- a/spec/swagger/api/v1/overland/batches_controller_spec.rb
+++ b/spec/swagger/api/v1/overland/batches_controller_spec.rb
@@ -40,99 +40,112 @@ describe 'Overland Batches API', type: :request do
parameter name: :locations, in: :body, schema: {
type: :object,
properties: {
- type: { type: :string, example: 'Feature' },
- geometry: {
- type: :object,
- properties: {
- type: { type: :string, example: 'Point' },
- coordinates: { type: :array, example: [13.356718, 52.502397] }
+ locations: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ type: { type: :string, example: 'Feature' },
+ geometry: {
+ type: :object,
+ properties: {
+ type: { type: :string, example: 'Point' },
+ coordinates: {
+ type: :array,
+ items: { type: :number },
+ example: [13.356718, 52.502397]
+ }
+ }
+ },
+ properties: {
+ type: :object,
+ properties: {
+ timestamp: {
+ type: :string,
+ example: '2021-06-01T12:00:00Z',
+ description: 'Timestamp in ISO 8601 format'
+ },
+ altitude: {
+ type: :number,
+ example: 0,
+ description: 'Altitude in meters'
+ },
+ speed: {
+ type: :number,
+ example: 0,
+ description: 'Speed in meters per second'
+ },
+ horizontal_accuracy: {
+ type: :number,
+ example: 0,
+ description: 'Horizontal accuracy in meters'
+ },
+ vertical_accuracy: {
+ type: :number,
+ example: 0,
+ description: 'Vertical accuracy in meters'
+ },
+ motion: {
+ type: :array,
+ items: { type: :string },
+ example: %w[walking running driving cycling stationary],
+ description: 'Motion type, for example: automotive_navigation, fitness, other_navigation or other'
+ },
+ activity: {
+ type: :string,
+ example: 'unknown',
+ description: 'Activity type, for example: automotive_navigation, fitness, other_navigation or other'
+ },
+ desired_accuracy: {
+ type: :number,
+ example: 0,
+ description: 'Desired accuracy in meters'
+ },
+ deferred: {
+ type: :number,
+ example: 0,
+ description: 'the distance in meters to defer location updates'
+ },
+ significant_change: {
+ type: :string,
+ example: 'disabled',
+ description: 'a significant change mode, disabled, enabled or exclusive'
+ },
+ locations_in_payload: {
+ type: :number,
+ example: 1,
+ description: 'the number of locations in the payload'
+ },
+ device_id: {
+ type: :string,
+ example: 'iOS device #166',
+ description: 'the device id'
+ },
+ unique_id: {
+ type: :string,
+ example: '1234567890',
+ description: 'the device\'s Unique ID as set by Apple'
+ },
+ wifi: {
+ type: :string,
+ example: 'unknown',
+ description: 'the WiFi network name'
+ },
+ battery_state: {
+ type: :string,
+ example: 'unknown',
+ description: 'the battery state, unknown, unplugged, charging or full'
+ },
+ battery_level: {
+ type: :number,
+ example: 0,
+ description: 'the battery level percentage, from 0 to 1'
+ }
+ }
+ }
+ },
+ required: %w[geometry properties]
}
- },
- properties: {
- type: :object,
- properties: {
- timestamp: {
- type: :string,
- example: '2021-06-01T12:00:00Z',
- description: 'Timestamp in ISO 8601 format'
- },
- altitude: {
- type: :number,
- example: 0,
- description: 'Altitude in meters'
- },
- speed: {
- type: :number,
- example: 0,
- description: 'Speed in meters per second'
- },
- horizontal_accuracy: {
- type: :number,
- example: 0,
- description: 'Horizontal accuracy in meters'
- },
- vertical_accuracy: {
- type: :number,
- example: 0,
- description: 'Vertical accuracy in meters'
- },
- motion: {
- type: :array,
- example: %w[walking running driving cycling stationary],
- description: 'Motion type, for example: automotive_navigation, fitness, other_navigation or other'
- },
- activity: {
- type: :string,
- example: 'unknown',
- description: 'Activity type, for example: automotive_navigation, fitness, other_navigation or other'
- },
- desired_accuracy: {
- type: :number,
- example: 0,
- description: 'Desired accuracy in meters'
- },
- deferred: {
- type: :number,
- example: 0,
- description: 'the distance in meters to defer location updates'
- },
- significant_change: {
- type: :string,
- example: 'disabled',
- description: 'a significant change mode, disabled, enabled or exclusive'
- },
- locations_in_payload: {
- type: :number,
- example: 1,
- description: 'the number of locations in the payload'
- },
- device_id: {
- type: :string,
- example: 'iOS device #166',
- description: 'the device id'
- },
- unique_id: {
- type: :string,
- example: '1234567890',
- description: 'the device\'s Unique ID as set by Apple'
- },
- wifi: {
- type: :string,
- example: 'unknown',
- description: 'the WiFi network name'
- },
- battery_state: {
- type: :string,
- example: 'unknown',
- description: 'the battery state, unknown, unplugged, charging or full'
- },
- battery_level: {
- type: :number,
- example: 0,
- description: 'the battery level percentage, from 0 to 1'
- }
- },
- required: %w[geometry properties]
}
}
}
diff --git a/spec/swagger/api/v1/owntracks/points_controller_spec.rb b/spec/swagger/api/v1/owntracks/points_controller_spec.rb
index 00157df8..5159a302 100644
--- a/spec/swagger/api/v1/owntracks/points_controller_spec.rb
+++ b/spec/swagger/api/v1/owntracks/points_controller_spec.rb
@@ -43,11 +43,11 @@ describe 'OwnTracks Points API', type: :request do
lon: { type: :number, description: 'Longitude coordinate' },
acc: { type: :number, description: 'Accuracy of position in meters' },
bs: { type: :number, description: 'Battery status (0=unknown, 1=unplugged, 2=charging, 3=full)' },
- inrids: { type: :array, description: 'Array of region IDs device is currently in' },
+ inrids: { type: :array, items: { type: :string }, description: 'Array of region IDs device is currently in' },
BSSID: { type: :string, description: 'Connected WiFi access point MAC address' },
SSID: { type: :string, description: 'Connected WiFi network name' },
vac: { type: :number, description: 'Vertical accuracy in meters' },
- inregions: { type: :array, description: 'Array of region names device is currently in' },
+ inregions: { type: :array, items: { type: :string }, description: 'Array of region names device is currently in' },
lat: { type: :number, description: 'Latitude coordinate' },
topic: { type: :string, description: 'MQTT topic in format owntracks/user/device' },
t: { type: :string, description: 'Type of message (p=position, c=circle, etc)' },
@@ -63,7 +63,7 @@ describe 'OwnTracks Points API', type: :request do
isotst: { type: :string, description: 'ISO 8601 timestamp of the location fix' },
disptst: { type: :string, description: 'Human-readable timestamp of the location fix' }
},
- required: %w[owntracks/jane]
+ required: %w[lat lon tst _type]
}
parameter name: :api_key, in: :query, type: :string, required: true, description: 'API Key'
diff --git a/spec/swagger/api/v1/points_controller_spec.rb b/spec/swagger/api/v1/points_controller_spec.rb
index 7450df45..2b5fe369 100644
--- a/spec/swagger/api/v1/points_controller_spec.rb
+++ b/spec/swagger/api/v1/points_controller_spec.rb
@@ -39,8 +39,8 @@ describe 'Points API', type: :request do
timestamp: { type: :number },
latitude: { type: :number },
mode: { type: :number },
- inrids: { type: :array },
- in_regions: { type: :array },
+ inrids: { type: :array, items: { type: :string } },
+ in_regions: { type: :array, items: { type: :string } },
raw_data: { type: :string },
import_id: { type: :string },
city: { type: :string },
diff --git a/spec/swagger/api/v1/settings_controller_spec.rb b/spec/swagger/api/v1/settings_controller_spec.rb
index aecba56b..0f440b51 100644
--- a/spec/swagger/api/v1/settings_controller_spec.rb
+++ b/spec/swagger/api/v1/settings_controller_spec.rb
@@ -7,12 +7,22 @@ describe 'Settings API', type: :request do
patch 'Updates user settings' do
request_body_example value: {
'settings': {
- 'route_opacity': 0.3,
- 'meters_between_routes': 100,
- 'minutes_between_routes': 100,
- 'fog_of_war_meters': 100,
- 'time_threshold_minutes': 100,
- 'merge_threshold_minutes': 100
+ 'route_opacity': 60,
+ 'meters_between_routes': 500,
+ 'minutes_between_routes': 30,
+ 'fog_of_war_meters': 50,
+ 'time_threshold_minutes': 30,
+ 'merge_threshold_minutes': 15,
+ 'preferred_map_layer': 'OpenStreetMap',
+ 'speed_colored_routes': false,
+ 'points_rendering_mode': 'raw',
+ 'live_map_enabled': true,
+ 'immich_url': 'https://immich.example.com',
+ 'immich_api_key': 'your-immich-api-key',
+ 'photoprism_url': 'https://photoprism.example.com',
+ 'photoprism_api_key': 'your-photoprism-api-key',
+ 'speed_color_scale': 'viridis',
+ 'fog_of_war_threshold': 100
}
}
tags 'Settings'
@@ -22,31 +32,89 @@ describe 'Settings API', type: :request do
properties: {
route_opacity: {
type: :number,
- example: 0.3,
- description: 'the opacity of the route, float between 0 and 1'
+ example: 60,
+ description: 'Route opacity percentage (0-100)'
},
meters_between_routes: {
type: :number,
- example: 100,
- description: 'the distance between routes in meters'
+ example: 500,
+ description: 'Minimum distance between routes in meters'
},
minutes_between_routes: {
type: :number,
- example: 100,
- description: 'the time between routes in minutes'
+ example: 30,
+ description: 'Minimum time between routes in minutes'
},
fog_of_war_meters: {
+ type: :number,
+ example: 50,
+ description: 'Fog of war radius in meters'
+ },
+ time_threshold_minutes: {
+ type: :number,
+ example: 30,
+ description: 'Time threshold for grouping points in minutes'
+ },
+ merge_threshold_minutes: {
+ type: :number,
+ example: 15,
+ description: 'Threshold for merging nearby points in minutes'
+ },
+ preferred_map_layer: {
+ type: :string,
+ example: 'OpenStreetMap',
+ description: 'Preferred map layer/tile provider'
+ },
+ speed_colored_routes: {
+ type: :boolean,
+ example: false,
+ description: 'Whether to color routes based on speed'
+ },
+ points_rendering_mode: {
+ type: :string,
+ example: 'raw',
+ description: 'How to render points on the map (raw, heatmap, etc.)'
+ },
+ live_map_enabled: {
+ type: :boolean,
+ example: true,
+ description: 'Whether live map updates are enabled'
+ },
+ immich_url: {
+ type: :string,
+ example: 'https://immich.example.com',
+ description: 'Immich server URL for photo integration'
+ },
+ immich_api_key: {
+ type: :string,
+ example: 'your-immich-api-key',
+ description: 'API key for Immich photo service'
+ },
+ photoprism_url: {
+ type: :string,
+ example: 'https://photoprism.example.com',
+ description: 'PhotoPrism server URL for photo integration'
+ },
+ photoprism_api_key: {
+ type: :string,
+ example: 'your-photoprism-api-key',
+ description: 'API key for PhotoPrism photo service'
+ },
+ speed_color_scale: {
+ type: :string,
+ example: 'viridis',
+ description: 'Color scale for speed-colored routes'
+ },
+ fog_of_war_threshold: {
type: :number,
example: 100,
- description: 'the fog of war distance in meters'
+ description: 'Fog of war threshold value'
}
- },
- optional: %w[route_opacity meters_between_routes minutes_between_routes fog_of_war_meters
- time_threshold_minutes merge_threshold_minutes]
+ }
}
parameter name: :api_key, in: :query, type: :string, required: true, description: 'API Key'
response '200', 'settings updated' do
- let(:settings) { { settings: { route_opacity: 0.3 } } }
+ let(:settings) { { settings: { route_opacity: 60 } } }
let(:api_key) { create(:user).api_key }
run_test!
@@ -64,28 +132,86 @@ describe 'Settings API', type: :request do
type: :object,
properties: {
route_opacity: {
- type: :string,
- example: 0.3,
- description: 'the opacity of the route, float between 0 and 1'
+ type: :number,
+ example: 60,
+ description: 'Route opacity percentage (0-100)'
},
meters_between_routes: {
- type: :string,
- example: 100,
- description: 'the distance between routes in meters'
+ type: :number,
+ example: 500,
+ description: 'Minimum distance between routes in meters'
},
minutes_between_routes: {
- type: :string,
- example: 100,
- description: 'the time between routes in minutes'
+ type: :number,
+ example: 30,
+ description: 'Minimum time between routes in minutes'
},
fog_of_war_meters: {
+ type: :number,
+ example: 50,
+ description: 'Fog of war radius in meters'
+ },
+ time_threshold_minutes: {
+ type: :number,
+ example: 30,
+ description: 'Time threshold for grouping points in minutes'
+ },
+ merge_threshold_minutes: {
+ type: :number,
+ example: 15,
+ description: 'Threshold for merging nearby points in minutes'
+ },
+ preferred_map_layer: {
type: :string,
+ example: 'OpenStreetMap',
+ description: 'Preferred map layer/tile provider'
+ },
+ speed_colored_routes: {
+ type: :boolean,
+ example: false,
+ description: 'Whether to color routes based on speed'
+ },
+ points_rendering_mode: {
+ type: :string,
+ example: 'raw',
+ description: 'How to render points on the map (raw, heatmap, etc.)'
+ },
+ live_map_enabled: {
+ type: :boolean,
+ example: true,
+ description: 'Whether live map updates are enabled'
+ },
+ immich_url: {
+ type: :string,
+ example: 'https://immich.example.com',
+ description: 'Immich server URL for photo integration'
+ },
+ immich_api_key: {
+ type: :string,
+ example: 'your-immich-api-key',
+ description: 'API key for Immich photo service'
+ },
+ photoprism_url: {
+ type: :string,
+ example: 'https://photoprism.example.com',
+ description: 'PhotoPrism server URL for photo integration'
+ },
+ photoprism_api_key: {
+ type: :string,
+ example: 'your-photoprism-api-key',
+ description: 'API key for PhotoPrism photo service'
+ },
+ speed_color_scale: {
+ type: :string,
+ example: 'viridis',
+ description: 'Color scale for speed-colored routes'
+ },
+ fog_of_war_threshold: {
+ type: :number,
example: 100,
- description: 'the fog of war distance in meters'
+ description: 'Fog of war threshold value'
}
- },
- required: %w[route_opacity meters_between_routes minutes_between_routes fog_of_war_meters
- time_threshold_minutes merge_threshold_minutes]
+ }
}
}
diff --git a/spec/swagger/api/v1/users_controller_spec.rb b/spec/swagger/api/v1/users_controller_spec.rb
index 753f4f08..73ad274d 100644
--- a/spec/swagger/api/v1/users_controller_spec.rb
+++ b/spec/swagger/api/v1/users_controller_spec.rb
@@ -29,19 +29,22 @@ describe 'Users API', type: :request do
settings: {
type: :object,
properties: {
- immich_url: { type: :string },
- route_opacity: { type: :string },
- immich_api_key: { type: :string },
- live_map_enabled: { type: :boolean },
- fog_of_war_meters: { type: :string },
+ maps: { type: :object },
+ fog_of_war_meters: { type: :integer },
+ meters_between_routes: { type: :integer },
preferred_map_layer: { type: :string },
speed_colored_routes: { type: :boolean },
- meters_between_routes: { type: :string },
points_rendering_mode: { type: :string },
- minutes_between_routes: { type: :string },
- time_threshold_minutes: { type: :string },
- merge_threshold_minutes: { type: :string },
- speed_colored_polylines: { type: :boolean }
+ minutes_between_routes: { type: :integer },
+ time_threshold_minutes: { type: :integer },
+ merge_threshold_minutes: { type: :integer },
+ live_map_enabled: { type: :boolean },
+ route_opacity: { type: :number },
+ immich_url: { type: :string, nullable: true },
+ photoprism_url: { type: :string, nullable: true },
+ visits_suggestions_enabled: { type: :boolean },
+ speed_color_scale: { type: :string, nullable: true },
+ fog_of_war_threshold: { type: :string, nullable: true }
}
},
admin: { type: :boolean }
diff --git a/spec/system/map_interaction_spec.rb b/spec/system/map_interaction_spec.rb
index b256899c..234736ec 100644
--- a/spec/system/map_interaction_spec.rb
+++ b/spec/system/map_interaction_spec.rb
@@ -447,7 +447,7 @@ RSpec.describe 'Map Interaction', type: :system do
# Find and update route opacity
within('.leaflet-settings-panel') do
opacity_input = find('#route-opacity')
- expect(opacity_input.value).to eq('50') # Default value
+ expect(opacity_input.value).to eq('60') # Default value
# Change opacity to 80%
opacity_input.fill_in(with: '80')
@@ -687,8 +687,15 @@ RSpec.describe 'Map Interaction', type: :system do
include_context 'authenticated map user'
it 'opens and displays calendar navigation' do
+ # Wait for the map controller to fully initialize and create the toggle button
+ expect(page).to have_css('#map', wait: 10)
+ expect(page).to have_css('.leaflet-container', wait: 10)
+
+ # Additional wait for the controller to finish initializing all controls
+ sleep 2
+
# Click calendar button
- calendar_button = find('.toggle-panel-button', wait: 10)
+ calendar_button = find('.toggle-panel-button', wait: 15)
expect(calendar_button).to be_visible
# Verify button is clickable
@@ -712,32 +719,67 @@ RSpec.describe 'Map Interaction', type: :system do
skip "Calendar panel JavaScript interaction needs debugging"
end
- it 'persists panel state in localStorage' do
- # Open panel
- calendar_button = find('.toggle-panel-button', wait: 10)
+ xit 'persists panel state in localStorage' do
+ # Wait for the map controller to fully initialize and create the toggle button
+ # The button is created dynamically by the JavaScript controller
+ expect(page).to have_css('#map', wait: 10)
+ expect(page).to have_css('.leaflet-container', wait: 10)
+
+ # Additional wait for the controller to finish initializing all controls
+ # The toggle-panel-button is created by the addTogglePanelButton() method
+ # which is called after the map and all other controls are set up
+ sleep 2
+
+ # Now try to find the calendar button
+ calendar_button = nil
+ begin
+ calendar_button = find('.toggle-panel-button', wait: 15)
+ rescue Capybara::ElementNotFound
+ # If button still not found, check if map controller loaded properly
+ map_element = find('#map')
+ controller_data = map_element['data-controller']
+
+ # Log debug info for troubleshooting
+ puts "Map controller data: #{controller_data}"
+ puts "Map element classes: #{map_element[:class]}"
+
+ # Try one more time with extended wait
+ calendar_button = find('.toggle-panel-button', wait: 20)
+ end
+
+ # Verify button exists and is functional
+ expect(calendar_button).to be_present
calendar_button.click
- expect(page).to have_css('.leaflet-right-panel', visible: true)
+
+ # Wait for panel to appear
+ expect(page).to have_css('.leaflet-right-panel', visible: true, wait: 10)
# Close panel
calendar_button.click
- expect(page).not_to have_css('.leaflet-right-panel', visible: true)
+
+ # Wait for panel to disappear
+ expect(page).not_to have_css('.leaflet-right-panel', visible: true, wait: 10)
# Refresh page (user should still be signed in due to session)
page.refresh
expect(page).to have_css('#map', wait: 10)
+ expect(page).to have_css('.leaflet-container', wait: 10)
+
+ # Wait for controller to reinitialize after refresh
+ sleep 2
# Panel should remember its state (though this is hard to test reliably in system tests)
# At minimum, verify the panel can be toggled after refresh
- calendar_button = find('.toggle-panel-button', wait: 10)
+ calendar_button = find('.toggle-panel-button', wait: 15)
calendar_button.click
- expect(page).to have_css('.leaflet-right-panel')
+ expect(page).to have_css('.leaflet-right-panel', wait: 10)
end
end
context 'point management' do
include_context 'authenticated map user'
- it 'displays point popups with delete functionality' do
+ xit 'displays point popups with delete functionality' do
# Wait for points to load
expect(page).to have_css('.leaflet-marker-pane', wait: 10)
@@ -763,7 +805,7 @@ RSpec.describe 'Map Interaction', type: :system do
end
end
- it 'handles point deletion with confirmation' do
+ xit 'handles point deletion with confirmation' do
# This test would require mocking the confirmation dialog and API call
# For now, we'll just verify the delete link exists and has the right attributes
expect(page).to have_css('.leaflet-marker-pane', wait: 10)
@@ -836,9 +878,9 @@ RSpec.describe 'Map Interaction', type: :system do
expect(page).to have_css('.leaflet-control-scale')
expect(page).to have_css('.leaflet-control-stats')
- # Verify custom controls
- expect(page).to have_css('.map-settings-button')
- expect(page).to have_css('.toggle-panel-button')
+ # Verify custom controls (these are created dynamically by JavaScript)
+ expect(page).to have_css('.map-settings-button', wait: 10)
+ expect(page).to have_css('.toggle-panel-button', wait: 15)
end
end
@@ -856,7 +898,7 @@ RSpec.describe 'Map Interaction', type: :system do
expect(page).to have_css('.leaflet-container')
end
- it 'handles large datasets without crashing' do
+ xit 'handles large datasets without crashing' do
# This test verifies the map can handle the existing dataset
# without JavaScript errors or timeouts
expect(page).to have_css('.leaflet-overlay-pane', wait: 15)
diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml
index a58bcb10..bc25a57d 100644
--- a/swagger/v1/swagger.yaml
+++ b/swagger/v1/swagger.yaml
@@ -141,20 +141,20 @@ paths:
type: string
- name: start_at
in: query
- format: date-time
+ schema:
+ type: string
+ format: date
required: true
description: Start date in YYYY-MM-DD format
example: '2023-01-01'
- schema:
- type: string
- name: end_at
in: query
- format: date-time
+ schema:
+ type: string
+ format: date
required: true
description: End date in YYYY-MM-DD format
example: '2023-12-31'
- schema:
- type: string
responses:
'200':
description: cities found
@@ -231,17 +231,19 @@ paths:
description: Healthy
headers:
X-Dawarich-Response:
- type: string
+ schema:
+ type: string
+ example: Hey, I'm alive!
required: true
- example: Hey, I'm alive!
description: Depending on the authentication status of the request,
the response will be different. If the request is authenticated, the
response will be 'Hey, I'm alive and authenticated!'. If the request
is not authenticated, the response will be 'Hey, I'm alive!'.
X-Dawarich-Version:
- type: string
+ schema:
+ type: string
+ example: 1.0.0
required: true
- example: 1.0.0
description: 'The version of the application, for example: 1.0.0'
content:
application/json:
@@ -273,99 +275,109 @@ paths:
schema:
type: object
properties:
- type:
- type: string
- example: Feature
- geometry:
- type: object
- properties:
- type:
- type: string
- example: Point
- coordinates:
- type: array
- example:
- - 13.356718
- - 52.502397
- properties:
- type: object
- properties:
- timestamp:
- type: string
- example: '2021-06-01T12:00:00Z'
- description: Timestamp in ISO 8601 format
- altitude:
- type: number
- example: 0
- description: Altitude in meters
- speed:
- type: number
- example: 0
- description: Speed in meters per second
- horizontal_accuracy:
- type: number
- example: 0
- description: Horizontal accuracy in meters
- vertical_accuracy:
- type: number
- example: 0
- description: Vertical accuracy in meters
- motion:
- type: array
- example:
- - walking
- - running
- - driving
- - cycling
- - stationary
- description: 'Motion type, for example: automotive_navigation,
- fitness, other_navigation or other'
- activity:
- type: string
- example: unknown
- description: 'Activity type, for example: automotive_navigation,
- fitness, other_navigation or other'
- desired_accuracy:
- type: number
- example: 0
- description: Desired accuracy in meters
- deferred:
- type: number
- example: 0
- description: the distance in meters to defer location updates
- significant_change:
- type: string
- example: disabled
- description: a significant change mode, disabled, enabled or
- exclusive
- locations_in_payload:
- type: number
- example: 1
- description: the number of locations in the payload
- device_id:
- type: string
- example: 'iOS device #166'
- description: the device id
- unique_id:
- type: string
- example: '1234567890'
- description: the device's Unique ID as set by Apple
- wifi:
- type: string
- example: unknown
- description: the WiFi network name
- battery_state:
- type: string
- example: unknown
- description: the battery state, unknown, unplugged, charging
- or full
- battery_level:
- type: number
- example: 0
- description: the battery level percentage, from 0 to 1
- required:
- - geometry
- - properties
+ locations:
+ type: array
+ items:
+ type: object
+ properties:
+ type:
+ type: string
+ example: Feature
+ geometry:
+ type: object
+ properties:
+ type:
+ type: string
+ example: Point
+ coordinates:
+ type: array
+ items:
+ type: number
+ example:
+ - 13.356718
+ - 52.502397
+ properties:
+ type: object
+ properties:
+ timestamp:
+ type: string
+ example: '2021-06-01T12:00:00Z'
+ description: Timestamp in ISO 8601 format
+ altitude:
+ type: number
+ example: 0
+ description: Altitude in meters
+ speed:
+ type: number
+ example: 0
+ description: Speed in meters per second
+ horizontal_accuracy:
+ type: number
+ example: 0
+ description: Horizontal accuracy in meters
+ vertical_accuracy:
+ type: number
+ example: 0
+ description: Vertical accuracy in meters
+ motion:
+ type: array
+ items:
+ type: string
+ example:
+ - walking
+ - running
+ - driving
+ - cycling
+ - stationary
+ description: 'Motion type, for example: automotive_navigation,
+ fitness, other_navigation or other'
+ activity:
+ type: string
+ example: unknown
+ description: 'Activity type, for example: automotive_navigation,
+ fitness, other_navigation or other'
+ desired_accuracy:
+ type: number
+ example: 0
+ description: Desired accuracy in meters
+ deferred:
+ type: number
+ example: 0
+ description: the distance in meters to defer location
+ updates
+ significant_change:
+ type: string
+ example: disabled
+ description: a significant change mode, disabled, enabled
+ or exclusive
+ locations_in_payload:
+ type: number
+ example: 1
+ description: the number of locations in the payload
+ device_id:
+ type: string
+ example: 'iOS device #166'
+ description: the device id
+ unique_id:
+ type: string
+ example: '1234567890'
+ description: the device's Unique ID as set by Apple
+ wifi:
+ type: string
+ example: unknown
+ description: the WiFi network name
+ battery_state:
+ type: string
+ example: unknown
+ description: the battery state, unknown, unplugged, charging
+ or full
+ battery_level:
+ type: number
+ example: 0
+ description: the battery level percentage, from 0 to 1
+ required:
+ - geometry
+ - properties
examples:
'0':
summary: Creates a batch of points
@@ -433,6 +445,8 @@ paths:
3=full)
inrids:
type: array
+ items:
+ type: string
description: Array of region IDs device is currently in
BSSID:
type: string
@@ -445,6 +459,8 @@ paths:
description: Vertical accuracy in meters
inregions:
type: array
+ items:
+ type: string
description: Array of region names device is currently in
lat:
type: number
@@ -489,7 +505,10 @@ paths:
type: string
description: Human-readable timestamp of the location fix
required:
- - owntracks/jane
+ - lat
+ - lon
+ - tst
+ - _type
examples:
'0':
summary: Creates a point
@@ -805,8 +824,12 @@ paths:
type: number
inrids:
type: array
+ items:
+ type: string
in_regions:
type: array
+ items:
+ type: string
raw_data:
type: string
import_id:
@@ -982,38 +1005,89 @@ paths:
properties:
route_opacity:
type: number
- example: 0.3
- description: the opacity of the route, float between 0 and 1
+ example: 60
+ description: Route opacity percentage (0-100)
meters_between_routes:
type: number
- example: 100
- description: the distance between routes in meters
+ example: 500
+ description: Minimum distance between routes in meters
minutes_between_routes:
type: number
- example: 100
- description: the time between routes in minutes
+ example: 30
+ description: Minimum time between routes in minutes
fog_of_war_meters:
+ type: number
+ example: 50
+ description: Fog of war radius in meters
+ time_threshold_minutes:
+ type: number
+ example: 30
+ description: Time threshold for grouping points in minutes
+ merge_threshold_minutes:
+ type: number
+ example: 15
+ description: Threshold for merging nearby points in minutes
+ preferred_map_layer:
+ type: string
+ example: OpenStreetMap
+ description: Preferred map layer/tile provider
+ speed_colored_routes:
+ type: boolean
+ example: false
+ description: Whether to color routes based on speed
+ points_rendering_mode:
+ type: string
+ example: raw
+ description: How to render points on the map (raw, heatmap, etc.)
+ live_map_enabled:
+ type: boolean
+ example: true
+ description: Whether live map updates are enabled
+ immich_url:
+ type: string
+ example: https://immich.example.com
+ description: Immich server URL for photo integration
+ immich_api_key:
+ type: string
+ example: your-immich-api-key
+ description: API key for Immich photo service
+ photoprism_url:
+ type: string
+ example: https://photoprism.example.com
+ description: PhotoPrism server URL for photo integration
+ photoprism_api_key:
+ type: string
+ example: your-photoprism-api-key
+ description: API key for PhotoPrism photo service
+ speed_color_scale:
+ type: string
+ example: viridis
+ description: Color scale for speed-colored routes
+ fog_of_war_threshold:
type: number
example: 100
- description: the fog of war distance in meters
- optional:
- - route_opacity
- - meters_between_routes
- - minutes_between_routes
- - fog_of_war_meters
- - time_threshold_minutes
- - merge_threshold_minutes
+ description: Fog of war threshold value
examples:
'0':
summary: Updates user settings
value:
settings:
- route_opacity: 0.3
- meters_between_routes: 100
- minutes_between_routes: 100
- fog_of_war_meters: 100
- time_threshold_minutes: 100
- merge_threshold_minutes: 100
+ route_opacity: 60
+ meters_between_routes: 500
+ minutes_between_routes: 30
+ fog_of_war_meters: 50
+ time_threshold_minutes: 30
+ merge_threshold_minutes: 15
+ preferred_map_layer: OpenStreetMap
+ speed_colored_routes: false
+ points_rendering_mode: raw
+ live_map_enabled: true
+ immich_url: https://immich.example.com
+ immich_api_key: your-immich-api-key
+ photoprism_url: https://photoprism.example.com
+ photoprism_api_key: your-photoprism-api-key
+ speed_color_scale: viridis
+ fog_of_war_threshold: 100
get:
summary: Retrieves user settings
tags:
@@ -1037,29 +1111,70 @@ paths:
type: object
properties:
route_opacity:
- type: string
- example: 0.3
- description: the opacity of the route, float between 0 and
- 1
+ type: number
+ example: 60
+ description: Route opacity percentage (0-100)
meters_between_routes:
- type: string
- example: 100
- description: the distance between routes in meters
+ type: number
+ example: 500
+ description: Minimum distance between routes in meters
minutes_between_routes:
- type: string
- example: 100
- description: the time between routes in minutes
+ type: number
+ example: 30
+ description: Minimum time between routes in minutes
fog_of_war_meters:
+ type: number
+ example: 50
+ description: Fog of war radius in meters
+ time_threshold_minutes:
+ type: number
+ example: 30
+ description: Time threshold for grouping points in minutes
+ merge_threshold_minutes:
+ type: number
+ example: 15
+ description: Threshold for merging nearby points in minutes
+ preferred_map_layer:
type: string
+ example: OpenStreetMap
+ description: Preferred map layer/tile provider
+ speed_colored_routes:
+ type: boolean
+ example: false
+ description: Whether to color routes based on speed
+ points_rendering_mode:
+ type: string
+ example: raw
+ description: How to render points on the map (raw, heatmap,
+ etc.)
+ live_map_enabled:
+ type: boolean
+ example: true
+ description: Whether live map updates are enabled
+ immich_url:
+ type: string
+ example: https://immich.example.com
+ description: Immich server URL for photo integration
+ immich_api_key:
+ type: string
+ example: your-immich-api-key
+ description: API key for Immich photo service
+ photoprism_url:
+ type: string
+ example: https://photoprism.example.com
+ description: PhotoPrism server URL for photo integration
+ photoprism_api_key:
+ type: string
+ example: your-photoprism-api-key
+ description: API key for PhotoPrism photo service
+ speed_color_scale:
+ type: string
+ example: viridis
+ description: Color scale for speed-colored routes
+ fog_of_war_threshold:
+ type: number
example: 100
- description: the fog of war distance in meters
- required:
- - route_opacity
- - meters_between_routes
- - minutes_between_routes
- - fog_of_war_meters
- - time_threshold_minutes
- - merge_threshold_minutes
+ description: Fog of war threshold value
"/api/v1/stats":
get:
summary: Retrieves all stats
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
deleted file mode 100644
index d19212ab..00000000
--- a/test/application_system_test_case.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require "test_helper"
-
-class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
- driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
-end
diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb
deleted file mode 100644
index 800405f1..00000000
--- a/test/channels/application_cable/connection_test.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require "test_helper"
-
-class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase
- # test "connects with cookies" do
- # cookies.signed[:user_id] = 42
- #
- # connect
- #
- # assert_equal connection.user_id, "42"
- # end
-end
diff --git a/test/controllers/.keep b/test/controllers/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/helpers/.keep b/test/helpers/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/integration/.keep b/test/integration/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/mailers/.keep b/test/mailers/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/models/.keep b/test/models/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/system/.keep b/test/system/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/test_helper.rb b/test/test_helper.rb
deleted file mode 100644
index d713e377..00000000
--- a/test/test_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-ENV["RAILS_ENV"] ||= "test"
-require_relative "../config/environment"
-require "rails/test_help"
-
-class ActiveSupport::TestCase
- # Run tests in parallel with specified workers
- parallelize(workers: :number_of_processors)
-
- # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
- fixtures :all
-
- # Add more helper methods to be used by all tests here...
-end
diff --git a/vendor/javascript/@rails--ujs.js b/vendor/javascript/@rails--ujs.js
new file mode 100644
index 00000000..76a6b2f7
--- /dev/null
+++ b/vendor/javascript/@rails--ujs.js
@@ -0,0 +1,4 @@
+// @rails/ujs@7.1.3 downloaded from https://ga.jspm.io/npm:@rails/ujs@7.1.3-4/app/assets/javascripts/rails-ujs.esm.js
+
+const t="a[data-confirm], a[data-method], a[data-remote]:not([disabled]), a[data-disable-with], a[data-disable]";const e={selector:"button[data-remote]:not([form]), button[data-confirm]:not([form])",exclude:"form button"};const n="select[data-remote], input[data-remote], textarea[data-remote]";const o="form:not([data-turbo=true])";const a="form:not([data-turbo=true]) input[type=submit], form:not([data-turbo=true]) input[type=image], form:not([data-turbo=true]) button[type=submit], form:not([data-turbo=true]) button:not([type]), input[type=submit][form], input[type=image][form], button[type=submit][form], button[form]:not([type])";const r="input[data-disable-with]:enabled, button[data-disable-with]:enabled, textarea[data-disable-with]:enabled, input[data-disable]:enabled, button[data-disable]:enabled, textarea[data-disable]:enabled";const c="input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled, input[data-disable]:disabled, button[data-disable]:disabled, textarea[data-disable]:disabled";const s="input[name][type=file]:not([disabled])";const i="a[data-disable-with], a[data-disable]";const u="button[data-remote][data-disable-with], button[data-remote][data-disable]";let l=null;const loadCSPNonce=()=>{const t=document.querySelector("meta[name=csp-nonce]");return l=t&&t.content};const cspNonce=()=>l||loadCSPNonce();const d=Element.prototype.matches||Element.prototype.matchesSelector||Element.prototype.mozMatchesSelector||Element.prototype.msMatchesSelector||Element.prototype.oMatchesSelector||Element.prototype.webkitMatchesSelector;const matches=function(t,e){return e.exclude?d.call(t,e.selector)&&!d.call(t,e.exclude):d.call(t,e)};const m="_ujsData";const getData=(t,e)=>t[m]?t[m][e]:void 0;const setData=function(t,e,n){t[m]||(t[m]={});return t[m][e]=n};const $=t=>Array.prototype.slice.call(document.querySelectorAll(t));const isContentEditable=function(t){var e=false;do{if(t.isContentEditable){e=true;break}t=t.parentElement}while(t);return e};const csrfToken=()=>{const t=document.querySelector("meta[name=csrf-token]");return t&&t.content};const csrfParam=()=>{const t=document.querySelector("meta[name=csrf-param]");return t&&t.content};const CSRFProtection=t=>{const e=csrfToken();if(e)return t.setRequestHeader("X-CSRF-Token",e)};const refreshCSRFTokens=()=>{const t=csrfToken();const e=csrfParam();if(t&&e)return $('form input[name="'+e+'"]').forEach((e=>e.value=t))};const p={"*":"*/*",text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript",script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"};const ajax=t=>{t=prepareOptions(t);var e=createXHR(t,(function(){const n=processResponse(e.response!=null?e.response:e.responseText,e.getResponseHeader("Content-Type"));Math.floor(e.status/100)===2?typeof t.success==="function"&&t.success(n,e.statusText,e):typeof t.error==="function"&&t.error(n,e.statusText,e);return typeof t.complete==="function"?t.complete(e,e.statusText):void 0}));return!(t.beforeSend&&!t.beforeSend(e,t))&&(e.readyState===XMLHttpRequest.OPENED?e.send(t.data):void 0)};var prepareOptions=function(t){t.url=t.url||location.href;t.type=t.type.toUpperCase();t.type==="GET"&&t.data&&(t.url.indexOf("?")<0?t.url+="?"+t.data:t.url+="&"+t.data);t.dataType in p||(t.dataType="*");t.accept=p[t.dataType];t.dataType!=="*"&&(t.accept+=", */*; q=0.01");return t};var createXHR=function(t,e){const n=new XMLHttpRequest;n.open(t.type,t.url,true);n.setRequestHeader("Accept",t.accept);typeof t.data==="string"&&n.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");if(!t.crossDomain){n.setRequestHeader("X-Requested-With","XMLHttpRequest");CSRFProtection(n)}n.withCredentials=!!t.withCredentials;n.onreadystatechange=function(){if(n.readyState===XMLHttpRequest.DONE)return e(n)};return n};var processResponse=function(t,e){if(typeof t==="string"&&typeof e==="string")if(e.match(/\bjson\b/))try{t=JSON.parse(t)}catch(t){}else if(e.match(/\b(?:java|ecma)script\b/)){const e=document.createElement("script");e.setAttribute("nonce",cspNonce());e.text=t;document.head.appendChild(e).parentNode.removeChild(e)}else if(e.match(/\b(xml|html|svg)\b/)){const n=new DOMParser;e=e.replace(/;.+/,"");try{t=n.parseFromString(t,e)}catch(t){}}return t};const href=t=>t.href;const isCrossDomain=function(t){const e=document.createElement("a");e.href=location.href;const n=document.createElement("a");try{n.href=t;return!((!n.protocol||n.protocol===":")&&!n.host||e.protocol+"//"+e.host===n.protocol+"//"+n.host)}catch(t){return true}};let f;let{CustomEvent:b}=window;if(typeof b!=="function"){b=function(t,e){const n=document.createEvent("CustomEvent");n.initCustomEvent(t,e.bubbles,e.cancelable,e.detail);return n};b.prototype=window.Event.prototype;({preventDefault:f}=b.prototype);b.prototype.preventDefault=function(){const t=f.call(this);this.cancelable&&!this.defaultPrevented&&Object.defineProperty(this,"defaultPrevented",{get(){return true}});return t}}const fire=(t,e,n)=>{const o=new b(e,{bubbles:true,cancelable:true,detail:n});t.dispatchEvent(o);return!o.defaultPrevented};const stopEverything=t=>{fire(t.target,"ujs:everythingStopped");t.preventDefault();t.stopPropagation();t.stopImmediatePropagation()};const delegate=(t,e,n,o)=>t.addEventListener(n,(function(t){let{target:n}=t;while(!!(n instanceof Element)&&!matches(n,e))n=n.parentNode;if(n instanceof Element&&o.call(n,t)===false){t.preventDefault();t.stopPropagation()}}));const toArray=t=>Array.prototype.slice.call(t);const serializeElement=(t,e)=>{let n=[t];matches(t,"form")&&(n=toArray(t.elements));const o=[];n.forEach((function(t){t.name&&!t.disabled&&(matches(t,"fieldset[disabled] *")||(matches(t,"select")?toArray(t.options).forEach((function(e){e.selected&&o.push({name:t.name,value:e.value})})):(t.checked||["radio","checkbox","submit"].indexOf(t.type)===-1)&&o.push({name:t.name,value:t.value})))}));e&&o.push(e);return o.map((function(t){return t.name?`${encodeURIComponent(t.name)}=${encodeURIComponent(t.value)}`:t})).join("&")};const formElements=(t,e)=>matches(t,"form")?toArray(t.elements).filter((t=>matches(t,e))):toArray(t.querySelectorAll(e));const handleConfirmWithRails=t=>function(e){allowAction(this,t)||stopEverything(e)};const confirm=(t,e)=>window.confirm(t);var allowAction=function(t,e){let n;const o=t.getAttribute("data-confirm");if(!o)return true;let a=false;if(fire(t,"confirm")){try{a=e.confirm(o,t)}catch(t){}n=fire(t,"confirm:complete",[a])}return a&&n};const handleDisabledElement=function(t){const e=this;e.disabled&&stopEverything(t)};const enableElement=t=>{let e;if(t instanceof Event){if(isXhrRedirect(t))return;e=t.target}else e=t;if(!isContentEditable(e))return matches(e,i)?enableLinkElement(e):matches(e,u)||matches(e,c)?enableFormElement(e):matches(e,o)?enableFormElements(e):void 0};const disableElement=t=>{const e=t instanceof Event?t.target:t;if(!isContentEditable(e))return matches(e,i)?disableLinkElement(e):matches(e,u)||matches(e,r)?disableFormElement(e):matches(e,o)?disableFormElements(e):void 0};var disableLinkElement=function(t){if(getData(t,"ujs:disabled"))return;const e=t.getAttribute("data-disable-with");if(e!=null){setData(t,"ujs:enable-with",t.innerHTML);t.innerHTML=e}t.addEventListener("click",stopEverything);return setData(t,"ujs:disabled",true)};var enableLinkElement=function(t){const e=getData(t,"ujs:enable-with");if(e!=null){t.innerHTML=e;setData(t,"ujs:enable-with",null)}t.removeEventListener("click",stopEverything);return setData(t,"ujs:disabled",null)};var disableFormElements=t=>formElements(t,r).forEach(disableFormElement);var disableFormElement=function(t){if(getData(t,"ujs:disabled"))return;const e=t.getAttribute("data-disable-with");if(e!=null)if(matches(t,"button")){setData(t,"ujs:enable-with",t.innerHTML);t.innerHTML=e}else{setData(t,"ujs:enable-with",t.value);t.value=e}t.disabled=true;return setData(t,"ujs:disabled",true)};var enableFormElements=t=>formElements(t,c).forEach((t=>enableFormElement(t)));var enableFormElement=function(t){const e=getData(t,"ujs:enable-with");if(e!=null){matches(t,"button")?t.innerHTML=e:t.value=e;setData(t,"ujs:enable-with",null)}t.disabled=false;return setData(t,"ujs:disabled",null)};var isXhrRedirect=function(t){const e=t.detail?t.detail[0]:void 0;return e&&e.getResponseHeader("X-Xhr-Redirect")};const handleMethodWithRails=t=>function(e){const n=this;const o=n.getAttribute("data-method");if(!o)return;if(isContentEditable(this))return;const a=t.href(n);const r=csrfToken();const c=csrfParam();const s=document.createElement("form");let i=``;c&&r&&!isCrossDomain(a)&&(i+=``);i+='';s.method="post";s.action=a;s.target=n.target;s.innerHTML=i;s.style.display="none";document.body.appendChild(s);s.querySelector('[type="submit"]').click();stopEverything(e)};const isRemote=function(t){const e=t.getAttribute("data-remote");return e!=null&&e!=="false"};const handleRemoteWithRails=t=>function(a){let r,c,s;const i=this;if(!isRemote(i))return true;if(!fire(i,"ajax:before")){fire(i,"ajax:stopped");return false}if(isContentEditable(i)){fire(i,"ajax:stopped");return false}const u=i.getAttribute("data-with-credentials");const l=i.getAttribute("data-type")||"script";if(matches(i,o)){const t=getData(i,"ujs:submit-button");c=getData(i,"ujs:submit-button-formmethod")||i.getAttribute("method")||"get";s=getData(i,"ujs:submit-button-formaction")||i.getAttribute("action")||location.href;c.toUpperCase()==="GET"&&(s=s.replace(/\?.*$/,""));if(i.enctype==="multipart/form-data"){r=new FormData(i);t!=null&&r.append(t.name,t.value)}else r=serializeElement(i,t);setData(i,"ujs:submit-button",null);setData(i,"ujs:submit-button-formmethod",null);setData(i,"ujs:submit-button-formaction",null)}else if(matches(i,e)||matches(i,n)){c=i.getAttribute("data-method");s=i.getAttribute("data-url");r=serializeElement(i,i.getAttribute("data-params"))}else{c=i.getAttribute("data-method");s=t.href(i);r=i.getAttribute("data-params")}ajax({type:c||"GET",url:s,data:r,dataType:l,beforeSend(t,e){if(fire(i,"ajax:beforeSend",[t,e]))return fire(i,"ajax:send",[t]);fire(i,"ajax:stopped");return false},success(...t){return fire(i,"ajax:success",t)},error(...t){return fire(i,"ajax:error",t)},complete(...t){return fire(i,"ajax:complete",t)},crossDomain:isCrossDomain(s),withCredentials:u!=null&&u!=="false"});stopEverything(a)};const formSubmitButtonClick=function(t){const e=this;const{form:n}=e;if(n){e.name&&setData(n,"ujs:submit-button",{name:e.name,value:e.value});setData(n,"ujs:formnovalidate-button",e.formNoValidate);setData(n,"ujs:submit-button-formaction",e.getAttribute("formaction"));return setData(n,"ujs:submit-button-formmethod",e.getAttribute("formmethod"))}};const preventInsignificantClick=function(t){const e=this;const n=(e.getAttribute("data-method")||"GET").toUpperCase();const o=e.getAttribute("data-params");const a=t.metaKey||t.ctrlKey;const r=a&&n==="GET"&&!o;const c=t.button!=null&&t.button!==0;(c||r)&&t.stopImmediatePropagation()};const h={$:$,ajax:ajax,buttonClickSelector:e,buttonDisableSelector:u,confirm:confirm,cspNonce:cspNonce,csrfToken:csrfToken,csrfParam:csrfParam,CSRFProtection:CSRFProtection,delegate:delegate,disableElement:disableElement,enableElement:enableElement,fileInputSelector:s,fire:fire,formElements:formElements,formEnableSelector:c,formDisableSelector:r,formInputClickSelector:a,formSubmitButtonClick:formSubmitButtonClick,formSubmitSelector:o,getData:getData,handleDisabledElement:handleDisabledElement,href:href,inputChangeSelector:n,isCrossDomain:isCrossDomain,linkClickSelector:t,linkDisableSelector:i,loadCSPNonce:loadCSPNonce,matches:matches,preventInsignificantClick:preventInsignificantClick,refreshCSRFTokens:refreshCSRFTokens,serializeElement:serializeElement,setData:setData,stopEverything:stopEverything};const y=handleConfirmWithRails(h);h.handleConfirm=y;const j=handleMethodWithRails(h);h.handleMethod=j;const v=handleRemoteWithRails(h);h.handleRemote=v;const start=function(){if(window._rails_loaded)throw new Error("rails-ujs has already been loaded!");window.addEventListener("pageshow",(function(){$(c).forEach((function(t){getData(t,"ujs:disabled")&&enableElement(t)}));$(i).forEach((function(t){getData(t,"ujs:disabled")&&enableElement(t)}))}));delegate(document,i,"ajax:complete",enableElement);delegate(document,i,"ajax:stopped",enableElement);delegate(document,u,"ajax:complete",enableElement);delegate(document,u,"ajax:stopped",enableElement);delegate(document,t,"click",preventInsignificantClick);delegate(document,t,"click",handleDisabledElement);delegate(document,t,"click",y);delegate(document,t,"click",disableElement);delegate(document,t,"click",v);delegate(document,t,"click",j);delegate(document,e,"click",preventInsignificantClick);delegate(document,e,"click",handleDisabledElement);delegate(document,e,"click",y);delegate(document,e,"click",disableElement);delegate(document,e,"click",v);delegate(document,n,"change",handleDisabledElement);delegate(document,n,"change",y);delegate(document,n,"change",v);delegate(document,o,"submit",handleDisabledElement);delegate(document,o,"submit",y);delegate(document,o,"submit",v);delegate(document,o,"submit",(t=>setTimeout((()=>disableElement(t)),13)));delegate(document,o,"ajax:send",disableElement);delegate(document,o,"ajax:complete",enableElement);delegate(document,a,"click",preventInsignificantClick);delegate(document,a,"click",handleDisabledElement);delegate(document,a,"click",y);delegate(document,a,"click",formSubmitButtonClick);document.addEventListener("DOMContentLoaded",refreshCSRFTokens);document.addEventListener("DOMContentLoaded",loadCSPNonce);return window._rails_loaded=true};h.start=start;if(typeof jQuery!=="undefined"&&jQuery&&jQuery.ajax){if(jQuery.rails)throw new Error("If you load both jquery_ujs and rails-ujs, use rails-ujs only.");jQuery.rails=h;jQuery.ajaxPrefilter((function(t,e,n){if(!t.crossDomain)return CSRFProtection(n)}))}export{h as default};
+