<%= column_chart(
- @digest.monthly_distances.sort.map { |month, distance_meters|
+ @digest.monthly_distances.sort_by { |month, _| month.to_i }.map { |month, distance_meters|
[Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters.to_i, @distance_unit).round]
},
height: '200px',
diff --git a/app/views/users/digests/show.html.erb b/app/views/users/digests/show.html.erb
index 3b69657b..d61225eb 100644
--- a/app/views/users/digests/show.html.erb
+++ b/app/views/users/digests/show.html.erb
@@ -101,7 +101,7 @@
<%= column_chart(
- @digest.monthly_distances.sort.map { |month, distance_meters|
+ @digest.monthly_distances.sort_by { |month, _| month.to_i }.map { |month, distance_meters|
[Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters.to_i, @distance_unit).round]
},
height: '250px',
@@ -142,6 +142,19 @@
<%= format_time_spent(country['minutes']) %>
<% end %>
+
+ <% if @digest.untracked_days > 0 %>
+
+
+ ?
+ No tracking data
+
+
<%= pluralize(@digest.untracked_days.round, 'day') %>
+
+
+ <%= icon 'lightbulb' %> Track more in <%= @digest.year + 1 %> to see a fuller picture of your travels!
+
+ <% end %>
<% if @digest.toponyms.present? %>
- <% max_cities = @digest.toponyms.map { |country| country['cities']&.length || 0 }.max %>
- <% progress_colors = ['progress-primary', 'progress-secondary', 'progress-accent', 'progress-info', 'progress-success', 'progress-warning'] %>
-
<% @digest.toponyms.each_with_index do |country, index| %>
- <% cities_count = country['cities']&.length || 0 %>
- <% progress_value = max_cities&.positive? ? (cities_count.to_f / max_cities * 100).round : 0 %>
- <% color_class = progress_colors[index % progress_colors.length] %>
-
@@ -170,10 +176,10 @@
<%= country['country'] %>
- <%= pluralize(cities_count, 'city') %>
+ <%= pluralize(country['cities']&.length || 0, 'city') %>
-
+
<% end %>
<% else %>
@@ -214,6 +220,12 @@
+ <%= button_to users_digest_path(year: @digest.year),
+ method: :delete,
+ class: 'btn btn-outline btn-error',
+ data: { turbo_confirm: "Are you sure you want to delete the #{@digest.year} digest? This cannot be undone." } do %>
+ <%= icon 'trash-2' %> Delete
+ <% end %>
Where You Spent the Most Time
- <% @digest.top_countries_by_time.take(3).each do |country| %>
+ <% @digest.top_countries_by_time.take(5).each do |country| %>
-
<%= country_flag(country['name']) %> <%= country['name'] %>
<%= format_time_spent(country['minutes']) %>
<% end %>
+ <% if @digest.untracked_days > 0 %>
+ -
+ No tracking data
+ <%= pluralize(@digest.untracked_days.round, 'day') %>
+
+ <% end %>
+ <% if @digest.untracked_days > 0 %>
+
+ 💡 Track more in <%= @digest.year + 1 %> to see a fuller picture of your travels!
+
+ <% end %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index ff40c143..64ec52ba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -101,8 +101,8 @@ Rails.application.routes.draw do
# User digests routes (yearly/monthly digest reports)
scope module: 'users' do
- resources :digests, only: %i[index create], param: :year, as: :users_digests
- get 'digests/:year', to: 'digests#show', as: :users_digest, constraints: { year: /\d{4}/ }
+ resources :digests, only: %i[index create show destroy], param: :year, as: :users_digests,
+ constraints: { year: /\d{4}/ }
end
get 'shared/digest/:uuid', to: 'shared/digests#show', as: :shared_users_digest
patch 'digests/:year/sharing',
diff --git a/db/migrate/20251228163703_install_rails_pulse_tables.rb b/db/migrate/20251228163703_install_rails_pulse_tables.rb
index 02548e36..ec63bdb6 100644
--- a/db/migrate/20251228163703_install_rails_pulse_tables.rb
+++ b/db/migrate/20251228163703_install_rails_pulse_tables.rb
@@ -3,21 +3,19 @@ class InstallRailsPulseTables < ActiveRecord::Migration[8.0]
def change
# Load and execute the Rails Pulse schema directly
# This ensures the migration is always in sync with the schema file
- schema_file = File.join(::Rails.root.to_s, "db/rails_pulse_schema.rb")
+ schema_file = Rails.root.join('db/rails_pulse_schema.rb').to_s
- if File.exist?(schema_file)
- say "Loading Rails Pulse schema from db/rails_pulse_schema.rb"
+ raise 'Rails Pulse schema file not found at db/rails_pulse_schema.rb' unless File.exist?(schema_file)
- # Load the schema file to define RailsPulse::Schema
- load schema_file
+ say 'Loading Rails Pulse schema from db/rails_pulse_schema.rb'
- # Execute the schema in the context of this migration
- RailsPulse::Schema.call(connection)
+ # Load the schema file to define RailsPulse::Schema
+ load schema_file
- say "Rails Pulse tables created successfully"
- say "The schema file db/rails_pulse_schema.rb remains as your single source of truth"
- else
- raise "Rails Pulse schema file not found at db/rails_pulse_schema.rb"
- end
+ # Execute the schema in the context of this migration
+ RailsPulse::Schema.call(connection)
+
+ say 'Rails Pulse tables created successfully'
+ say 'The schema file db/rails_pulse_schema.rb remains as your single source of truth'
end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20260103114630_add_indexes_to_points_for_stats_query.rb b/db/migrate/20260103114630_add_indexes_to_points_for_stats_query.rb
new file mode 100644
index 00000000..f91edb61
--- /dev/null
+++ b/db/migrate/20260103114630_add_indexes_to_points_for_stats_query.rb
@@ -0,0 +1,21 @@
+class AddIndexesToPointsForStatsQuery < ActiveRecord::Migration[8.0]
+ disable_ddl_transaction!
+
+ def change
+ # Index for counting reverse geocoded points
+ # This speeds up: COUNT(reverse_geocoded_at)
+ add_index :points, [:user_id, :reverse_geocoded_at],
+ where: "reverse_geocoded_at IS NOT NULL",
+ algorithm: :concurrently,
+ if_not_exists: true,
+ name: 'index_points_on_user_id_and_reverse_geocoded_at'
+
+ # Index for finding points with empty geodata
+ # This speeds up: COUNT(CASE WHEN geodata = '{}'::jsonb THEN 1 END)
+ add_index :points, [:user_id, :geodata],
+ where: "geodata = '{}'::jsonb",
+ algorithm: :concurrently,
+ if_not_exists: true,
+ name: 'index_points_on_user_id_and_empty_geodata'
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a5ddaf50..d7baaeb4 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_12_28_163703) do
+ActiveRecord::Schema[8.0].define(version: 2026_01_03_114630) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"
enable_extension "postgis"
@@ -260,6 +260,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_28_163703) do
t.index ["track_id"], name: "index_points_on_track_id"
t.index ["user_id", "city"], name: "idx_points_user_city"
t.index ["user_id", "country_name"], name: "idx_points_user_country_name"
+ t.index ["user_id", "geodata"], name: "index_points_on_user_id_and_empty_geodata", where: "(geodata = '{}'::jsonb)"
t.index ["user_id", "reverse_geocoded_at"], name: "index_points_on_user_id_and_reverse_geocoded_at", where: "(reverse_geocoded_at IS NOT NULL)"
t.index ["user_id", "timestamp", "track_id"], name: "idx_points_track_generation"
t.index ["user_id", "timestamp"], name: "idx_points_user_visit_null_timestamp", where: "(visit_id IS NULL)"
@@ -521,6 +522,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_28_163703) do
add_foreign_key "notifications", "users"
add_foreign_key "place_visits", "places"
add_foreign_key "place_visits", "visits"
+ add_foreign_key "points", "points_raw_data_archives", column: "raw_data_archive_id", name: "fk_rails_points_raw_data_archives", on_delete: :nullify, validate: false
add_foreign_key "points", "points_raw_data_archives", column: "raw_data_archive_id", on_delete: :nullify
add_foreign_key "points", "users"
add_foreign_key "points", "visits"
diff --git a/e2e/setup/auth.setup.js b/e2e/setup/auth.setup.js
index de992dbf..9b4236a1 100644
--- a/e2e/setup/auth.setup.js
+++ b/e2e/setup/auth.setup.js
@@ -1,4 +1,5 @@
import { test as setup, expect } from '@playwright/test';
+import { disableGlobeProjection } from '../v2/helpers/setup.js';
const authFile = 'e2e/temp/.auth/user.json';
@@ -19,6 +20,9 @@ setup('authenticate', async ({ page }) => {
// Wait for successful navigation to map (v1 or v2 depending on user preference)
await page.waitForURL(/\/map(\/v[12])?/, { timeout: 10000 });
+ // Disable globe projection to ensure consistent E2E test behavior
+ await disableGlobeProjection(page);
+
// Save authentication state
await page.context().storageState({ path: authFile });
});
diff --git a/e2e/v2/helpers/setup.js b/e2e/v2/helpers/setup.js
index 922c6848..6fade8e1 100644
--- a/e2e/v2/helpers/setup.js
+++ b/e2e/v2/helpers/setup.js
@@ -2,6 +2,33 @@
* Helper functions for Maps V2 E2E tests
*/
+/**
+ * Disable globe projection setting via API
+ * This ensures consistent map rendering for E2E tests
+ * @param {Page} page - Playwright page object
+ */
+export async function disableGlobeProjection(page) {
+ // Get API key from the page (requires being logged in)
+ const apiKey = await page.evaluate(() => {
+ const metaTag = document.querySelector('meta[name="api-key"]');
+ return metaTag?.content;
+ });
+
+ if (apiKey) {
+ await page.request.patch('/api/v1/settings', {
+ headers: {
+ 'Authorization': `Bearer ${apiKey}`,
+ 'Content-Type': 'application/json'
+ },
+ data: {
+ settings: {
+ globe_projection: false
+ }
+ }
+ });
+ }
+}
+
/**
* Navigate to Maps V2 page
* @param {Page} page - Playwright page object
diff --git a/package-lock.json b/package-lock.json
index dccd4527..82e72055 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
"leaflet": "^1.9.4",
"maplibre-gl": "^5.13.0",
"postcss": "^8.4.49",
- "trix": "^2.1.15"
+ "trix": "^2.1.16"
},
"devDependencies": {
"@playwright/test": "^1.56.1",
@@ -575,12 +575,14 @@
"license": "ISC"
},
"node_modules/trix": {
- "version": "2.1.15",
- "resolved": "https://registry.npmjs.org/trix/-/trix-2.1.15.tgz",
- "integrity": "sha512-LoaXWczdTUV8+3Box92B9b1iaDVbxD14dYemZRxi3PwY+AuDm97BUJV2aHLBUFPuDABhxp0wzcbf0CxHCVmXiw==",
- "license": "MIT",
+ "version": "2.1.16",
+ "resolved": "https://registry.npmjs.org/trix/-/trix-2.1.16.tgz",
+ "integrity": "sha512-XtZgWI+oBvLzX7CWnkIf+ZWC+chL+YG/TkY43iMTV0Zl+CJjn18B1GJUCEWJ8qgfpcyMBuysnNAfPWiv2sV14A==",
"dependencies": {
"dompurify": "^3.2.5"
+ },
+ "engines": {
+ "node": ">= 18"
}
},
"node_modules/undici-types": {
@@ -986,9 +988,9 @@
"integrity": "sha512-gRa9gwYU3ECmQYv3lslts5hxuIa90veaEcxDYuu3QGOIAEM2mOZkVHp48ANJuu1CURtRdHKUBY5Lm1tHV+sD4g=="
},
"trix": {
- "version": "2.1.15",
- "resolved": "https://registry.npmjs.org/trix/-/trix-2.1.15.tgz",
- "integrity": "sha512-LoaXWczdTUV8+3Box92B9b1iaDVbxD14dYemZRxi3PwY+AuDm97BUJV2aHLBUFPuDABhxp0wzcbf0CxHCVmXiw==",
+ "version": "2.1.16",
+ "resolved": "https://registry.npmjs.org/trix/-/trix-2.1.16.tgz",
+ "integrity": "sha512-XtZgWI+oBvLzX7CWnkIf+ZWC+chL+YG/TkY43iMTV0Zl+CJjn18B1GJUCEWJ8qgfpcyMBuysnNAfPWiv2sV14A==",
"requires": {
"dompurify": "^3.2.5"
}
diff --git a/package.json b/package.json
index 9946febf..cadd2963 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"leaflet": "^1.9.4",
"maplibre-gl": "^5.13.0",
"postcss": "^8.4.49",
- "trix": "^2.1.15"
+ "trix": "^2.1.16"
},
"engines": {
"node": "18.17.1",
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 7eac9400..e016ce3b 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -163,12 +163,16 @@ RSpec.describe User, type: :model do
describe '#countries_visited' do
subject { user.countries_visited }
- let!(:point1) { create(:point, user:, country_name: 'Germany') }
- let!(:point2) { create(:point, user:, country_name: 'France') }
- let!(:point3) { create(:point, user:, country_name: nil) }
- let!(:point4) { create(:point, user:, country_name: '') }
+ let!(:stat) do
+ create(:stat, user:, toponyms: [
+ { 'country' => 'Germany', 'cities' => [{ 'city' => 'Berlin', 'stayed_for' => 120 }] },
+ { 'country' => 'France', 'cities' => [{ 'city' => 'Paris', 'stayed_for' => 90 }] },
+ { 'country' => nil, 'cities' => [] },
+ { 'country' => '', 'cities' => [] }
+ ])
+ end
- it 'returns array of countries' do
+ it 'returns array of countries from stats toponyms' do
expect(subject).to include('Germany', 'France')
expect(subject.count).to eq(2)
end
@@ -181,12 +185,18 @@ RSpec.describe User, type: :model do
describe '#cities_visited' do
subject { user.cities_visited }
- let!(:point1) { create(:point, user:, city: 'Berlin') }
- let!(:point2) { create(:point, user:, city: 'Paris') }
- let!(:point3) { create(:point, user:, city: nil) }
- let!(:point4) { create(:point, user:, city: '') }
+ let!(:stat) do
+ create(:stat, user:, toponyms: [
+ { 'country' => 'Germany', 'cities' => [
+ { 'city' => 'Berlin', 'stayed_for' => 120 },
+ { 'city' => nil, 'stayed_for' => 60 },
+ { 'city' => '', 'stayed_for' => 60 }
+ ] },
+ { 'country' => 'France', 'cities' => [{ 'city' => 'Paris', 'stayed_for' => 90 }] }
+ ])
+ end
- it 'returns array of cities' do
+ it 'returns array of cities from stats toponyms' do
expect(subject).to include('Berlin', 'Paris')
expect(subject.count).to eq(2)
end
@@ -210,11 +220,15 @@ RSpec.describe User, type: :model do
describe '#total_countries' do
subject { user.total_countries }
- let!(:point1) { create(:point, user:, country_name: 'Germany') }
- let!(:point2) { create(:point, user:, country_name: 'France') }
- let!(:point3) { create(:point, user:, country_name: nil) }
+ let!(:stat) do
+ create(:stat, user:, toponyms: [
+ { 'country' => 'Germany', 'cities' => [] },
+ { 'country' => 'France', 'cities' => [] },
+ { 'country' => nil, 'cities' => [] }
+ ])
+ end
- it 'returns number of countries' do
+ it 'returns number of countries from stats toponyms' do
expect(subject).to eq(2)
end
end
@@ -222,11 +236,17 @@ RSpec.describe User, type: :model do
describe '#total_cities' do
subject { user.total_cities }
- let!(:point1) { create(:point, user:, city: 'Berlin') }
- let!(:point2) { create(:point, user:, city: 'Paris') }
- let!(:point3) { create(:point, user:, city: nil) }
+ let!(:stat) do
+ create(:stat, user:, toponyms: [
+ { 'country' => 'Germany', 'cities' => [
+ { 'city' => 'Berlin', 'stayed_for' => 120 },
+ { 'city' => 'Paris', 'stayed_for' => 90 },
+ { 'city' => nil, 'stayed_for' => 60 }
+ ] }
+ ])
+ end
- it 'returns number of cities' do
+ it 'returns number of cities from stats toponyms' do
expect(subject).to eq(2)
end
end
diff --git a/spec/requests/users/digests_spec.rb b/spec/requests/users/digests_spec.rb
index 56e65ec0..485b0fd7 100644
--- a/spec/requests/users/digests_spec.rb
+++ b/spec/requests/users/digests_spec.rb
@@ -27,6 +27,14 @@ RSpec.describe '/digests', type: :request do
expect(response.status).to eq(302)
end
end
+
+ describe 'DELETE /destroy' do
+ it 'redirects to the sign in page' do
+ delete users_digest_url(year: 2024)
+
+ expect(response).to redirect_to(new_user_session_path)
+ end
+ end
end
context 'when user is signed in' do
@@ -137,5 +145,40 @@ RSpec.describe '/digests', type: :request do
end
end
end
+
+ describe 'DELETE /destroy' do
+ let!(:digest) { create(:users_digest, user:, year: 2024) }
+
+ it 'deletes the digest' do
+ expect do
+ delete users_digest_url(year: 2024)
+ end.to change(Users::Digest, :count).by(-1)
+ end
+
+ it 'redirects with success notice' do
+ delete users_digest_url(year: 2024)
+
+ expect(response).to redirect_to(users_digests_path)
+ expect(flash[:notice]).to eq('Year-end digest for 2024 has been deleted')
+ end
+
+ it 'returns not found for non-existent digest' do
+ delete users_digest_url(year: 2020)
+
+ expect(response).to redirect_to(users_digests_path)
+ expect(flash[:alert]).to eq('Digest not found')
+ end
+
+ it 'cannot delete another user digest' do
+ other_user = create(:user)
+ other_digest = create(:users_digest, user: other_user, year: 2023)
+
+ delete users_digest_url(year: 2023)
+
+ expect(response).to redirect_to(users_digests_path)
+ expect(flash[:alert]).to eq('Digest not found')
+ expect(other_digest.reload).to be_present
+ end
+ end
end
end
diff --git a/spec/services/countries_and_cities_spec.rb b/spec/services/countries_and_cities_spec.rb
index 636823e5..5e58d67f 100644
--- a/spec/services/countries_and_cities_spec.rb
+++ b/spec/services/countries_and_cities_spec.rb
@@ -79,6 +79,58 @@ RSpec.describe CountriesAndCities do
)
end
end
+
+ context 'when points have a gap larger than threshold (passing through)' do
+ let(:points) do
+ [
+ # User in Berlin at 9:00, leaves, returns at 11:00
+ create(:point, city: 'Berlin', country: 'Germany', timestamp:),
+ create(:point, city: 'Berlin', country: 'Germany', timestamp: timestamp + 15.minutes),
+ # 105-minute gap here (user left the city)
+ create(:point, city: 'Berlin', country: 'Germany', timestamp: timestamp + 120.minutes),
+ create(:point, city: 'Berlin', country: 'Germany', timestamp: timestamp + 130.minutes)
+ ]
+ end
+
+ it 'only counts time between consecutive points within threshold' do
+ # Old logic would count 130 minutes (span from first to last)
+ # New logic counts: 15 min (0->15) + 10 min (120->130) = 25 minutes
+ # Since 25 < 60, Berlin should be filtered out
+ expect(countries_and_cities).to eq(
+ [
+ CountriesAndCities::CountryData.new(
+ country: 'Germany',
+ cities: []
+ )
+ ]
+ )
+ end
+ end
+
+ context 'when points span a long time but have continuous presence' do
+ let(:points) do
+ # Points every 30 minutes for 2.5 hours = continuous presence
+ (0..5).map do |i|
+ create(:point, city: 'Berlin', country: 'Germany', timestamp: timestamp + (i * 30).minutes)
+ end
+ end
+
+ it 'counts the full duration when all intervals are within threshold' do
+ # 5 intervals of 30 minutes each = 150 minutes total
+ expect(countries_and_cities).to eq(
+ [
+ CountriesAndCities::CountryData.new(
+ country: 'Germany',
+ cities: [
+ CountriesAndCities::CityData.new(
+ city: 'Berlin', points: 6, timestamp: (timestamp + 150.minutes).to_i, stayed_for: 150
+ )
+ ]
+ )
+ ]
+ )
+ end
+ end
end
end
end
diff --git a/spec/services/points/raw_data/verifier_spec.rb b/spec/services/points/raw_data/verifier_spec.rb
index 5611748a..6f035230 100644
--- a/spec/services/points/raw_data/verifier_spec.rb
+++ b/spec/services/points/raw_data/verifier_spec.rb
@@ -61,16 +61,18 @@ RSpec.describe Points::RawData::Verifier do
end.not_to change { archive.reload.verified_at }
end
- it 'detects deleted points' do
+ it 'still verifies successfully when points are deleted from database' do
# Force archive creation first
archive_id = archive.id
# Then delete one point from database
points.first.destroy
+ # Verification should still succeed - deleted points are acceptable
+ # (users should be able to delete their data without failing archive verification)
expect do
verifier.verify_specific_archive(archive_id)
- end.not_to change { archive.reload.verified_at }
+ end.to change { archive.reload.verified_at }.from(nil)
end
it 'detects raw_data mismatch between archive and database' do
diff --git a/spec/services/stats/calculate_month_spec.rb b/spec/services/stats/calculate_month_spec.rb
index dbb1928a..12ea5f9f 100644
--- a/spec/services/stats/calculate_month_spec.rb
+++ b/spec/services/stats/calculate_month_spec.rb
@@ -155,10 +155,14 @@ RSpec.describe Stats::CalculateMonth do
context 'when user visited multiple cities with mixed durations' do
let!(:mixed_points) do
[
- # Berlin: 70 minutes (should be included)
+ # Berlin: 70 minutes with continuous presence (should be included)
+ # Points every 35 minutes: 0, 35, 70 = 70 min total
create(:point, user:, import:, timestamp: timestamp_base,
city: 'Berlin', country_name: 'Germany',
lonlat: 'POINT(13.404954 52.520008)'),
+ create(:point, user:, import:, timestamp: timestamp_base + 35.minutes,
+ city: 'Berlin', country_name: 'Germany',
+ lonlat: 'POINT(13.404954 52.520008)'),
create(:point, user:, import:, timestamp: timestamp_base + 70.minutes,
city: 'Berlin', country_name: 'Germany',
lonlat: 'POINT(13.404954 52.520008)'),
@@ -171,10 +175,17 @@ RSpec.describe Stats::CalculateMonth do
city: 'Prague', country_name: 'Czech Republic',
lonlat: 'POINT(14.4378 50.0755)'),
- # Vienna: 90 minutes (should be included)
+ # Vienna: 90 minutes with continuous presence (should be included)
+ # Points every 30 minutes: 150, 180, 210, 240 = 90 min total
create(:point, user:, import:, timestamp: timestamp_base + 150.minutes,
city: 'Vienna', country_name: 'Austria',
lonlat: 'POINT(16.3738 48.2082)'),
+ create(:point, user:, import:, timestamp: timestamp_base + 180.minutes,
+ city: 'Vienna', country_name: 'Austria',
+ lonlat: 'POINT(16.3738 48.2082)'),
+ create(:point, user:, import:, timestamp: timestamp_base + 210.minutes,
+ city: 'Vienna', country_name: 'Austria',
+ lonlat: 'POINT(16.3738 48.2082)'),
create(:point, user:, import:, timestamp: timestamp_base + 240.minutes,
city: 'Vienna', country_name: 'Austria',
lonlat: 'POINT(16.3738 48.2082)')
diff --git a/spec/services/users/digests/calculate_year_spec.rb b/spec/services/users/digests/calculate_year_spec.rb
index fe01120f..2d1fe1cb 100644
--- a/spec/services/users/digests/calculate_year_spec.rb
+++ b/spec/services/users/digests/calculate_year_spec.rb
@@ -76,19 +76,169 @@ RSpec.describe Users::Digests::CalculateYear do
expect(calculate_digest.monthly_distances['3']).to eq('0') # Missing month
end
- it 'calculates time spent by location' do
+ it 'calculates time spent by location using hybrid day-based approach' do
+ # Create points to test hybrid calculation
+ # Jan 1: single country day (Germany) -> full 1440 minutes
+ jan_1_10am = Time.zone.local(2024, 1, 1, 10, 0, 0).to_i
+ jan_1_11am = Time.zone.local(2024, 1, 1, 11, 0, 0).to_i
+ jan_1_12pm = Time.zone.local(2024, 1, 1, 12, 0, 0).to_i
+ # Feb 1: single country day (France) -> full 1440 minutes
+ feb_1_10am = Time.zone.local(2024, 2, 1, 10, 0, 0).to_i
+
+ create(:point, user: user, timestamp: jan_1_10am, country_name: 'Germany', city: 'Berlin')
+ create(:point, user: user, timestamp: jan_1_11am, country_name: 'Germany', city: 'Berlin')
+ create(:point, user: user, timestamp: jan_1_12pm, country_name: 'Germany', city: 'Munich')
+ create(:point, user: user, timestamp: feb_1_10am, country_name: 'France', city: 'Paris')
+
countries = calculate_digest.time_spent_by_location['countries']
cities = calculate_digest.time_spent_by_location['cities']
- expect(countries.first['name']).to eq('Germany')
- expect(countries.first['minutes']).to eq(720) # 480 + 240
+ # Germany: 1 full day = 1440 minutes
+ germany_country = countries.find { |c| c['name'] == 'Germany' }
+ expect(germany_country['minutes']).to eq(1440)
+
+ # France: 1 full day = 1440 minutes
+ france_country = countries.find { |c| c['name'] == 'France' }
+ expect(france_country['minutes']).to eq(1440)
+
+ # Cities: based on stayed_for from monthly stats (sum across months)
expect(cities.first['name']).to eq('Berlin')
+ expect(cities.first['minutes']).to eq(480)
end
it 'calculates all time stats' do
expect(calculate_digest.all_time_stats['total_distance']).to eq('125000')
end
+ context 'when user visits same country across multiple months' do
+ it 'counts each day as a full day for single-country days' do
+ # Create hourly points across multiple days in March and July
+ mar_start = Time.zone.local(2024, 3, 1, 10, 0, 0).to_i
+ jul_start = Time.zone.local(2024, 7, 1, 10, 0, 0).to_i
+
+ # Create 3 days of hourly points in March
+ 3.times do |day|
+ 3.times do |hour|
+ timestamp = mar_start + (day * 24 * 60 * 60) + (hour * 60 * 60)
+ create(:point, user: user, timestamp: timestamp, country_name: 'Germany', city: 'Berlin')
+ end
+ end
+
+ # Create 3 days of hourly points in July
+ 3.times do |day|
+ 3.times do |hour|
+ timestamp = jul_start + (day * 24 * 60 * 60) + (hour * 60 * 60)
+ create(:point, user: user, timestamp: timestamp, country_name: 'Germany', city: 'Munich')
+ end
+ end
+
+ # Create the monthly stats
+ create(:stat, user: user, year: 2024, month: 3, distance: 10_000, toponyms: [
+ { 'country' => 'Germany', 'cities' => [
+ { 'city' => 'Berlin', 'stayed_for' => 14_400 }
+ ] }
+ ])
+
+ create(:stat, user: user, year: 2024, month: 7, distance: 15_000, toponyms: [
+ { 'country' => 'Germany', 'cities' => [
+ { 'city' => 'Munich', 'stayed_for' => 14_400 }
+ ] }
+ ])
+
+ digest = calculate_digest
+ countries = digest.time_spent_by_location['countries']
+ germany = countries.find { |c| c['name'] == 'Germany' }
+
+ # Each single-country day = 1440 minutes
+ # 6 days total (3 in March + 3 in July) = 6 * 1440 = 8640 minutes
+ expect(germany['minutes']).to eq(6 * 1440)
+
+ # Total should equal exactly 6 days
+ total_days = germany['minutes'] / 1440.0
+ expect(total_days).to eq(6)
+ end
+ end
+
+ context 'when there are large gaps between points on same day' do
+ it 'still counts the full day for single-country day' do
+ point_1 = Time.zone.local(2024, 1, 1, 10, 0, 0).to_i
+ point_2 = Time.zone.local(2024, 1, 1, 12, 0, 0).to_i # 2 hours later
+ point_3 = Time.zone.local(2024, 1, 1, 18, 0, 0).to_i # 6 hours later
+
+ create(:point, user: user, timestamp: point_1, country_name: 'Germany')
+ create(:point, user: user, timestamp: point_2, country_name: 'Germany')
+ create(:point, user: user, timestamp: point_3, country_name: 'Germany')
+
+ digest = calculate_digest
+ germany = digest.time_spent_by_location['countries'].find { |c| c['name'] == 'Germany' }
+
+ # Hybrid approach: single-country day = full 1440 minutes
+ # regardless of gaps between points
+ expect(germany['minutes']).to eq(1440)
+ end
+ end
+
+ context 'when transitioning between countries on same day' do
+ it 'calculates proportional time based on time spans' do
+ # Multi-country day: Germany 10:00-10:30, France 11:00-11:30
+ point_1 = Time.zone.local(2024, 1, 1, 10, 0, 0).to_i
+ point_2 = Time.zone.local(2024, 1, 1, 10, 30, 0).to_i # In Germany
+ point_3 = Time.zone.local(2024, 1, 1, 11, 0, 0).to_i # Now in France
+ point_4 = Time.zone.local(2024, 1, 1, 11, 30, 0).to_i # Still in France
+
+ create(:point, user: user, timestamp: point_1, country_name: 'Germany')
+ create(:point, user: user, timestamp: point_2, country_name: 'Germany')
+ create(:point, user: user, timestamp: point_3, country_name: 'France')
+ create(:point, user: user, timestamp: point_4, country_name: 'France')
+
+ digest = calculate_digest
+ countries = digest.time_spent_by_location['countries']
+
+ germany = countries.find { |c| c['name'] == 'Germany' }
+ france = countries.find { |c| c['name'] == 'France' }
+
+ # Germany span: 10:30 - 10:00 = 30 min = 1800 seconds
+ # France span: 11:30 - 11:00 = 30 min = 1800 seconds
+ # Total spans = 3600 seconds
+ # Each country gets 50% of 1440 = 720 minutes
+ expect(germany['minutes']).to eq(720)
+ expect(france['minutes']).to eq(720)
+ # Total = 1440 (exactly one day)
+ expect(germany['minutes'] + france['minutes']).to eq(1440)
+ end
+ end
+
+ context 'when visiting multiple countries on same day' do
+ it 'calculates proportional time and never exceeds one day total' do
+ # This tests the fix for the original bug: border crossing should not count double
+ # France: 8am-9am (1 hour span = 3600 seconds)
+ # Germany: 10am-11am (1 hour span = 3600 seconds)
+ jan_1_8am = Time.zone.local(2024, 1, 1, 8, 0, 0).to_i
+ jan_1_9am = Time.zone.local(2024, 1, 1, 9, 0, 0).to_i
+ jan_1_10am = Time.zone.local(2024, 1, 1, 10, 0, 0).to_i # Border crossing
+ jan_1_11am = Time.zone.local(2024, 1, 1, 11, 0, 0).to_i
+
+ create(:point, user: user, timestamp: jan_1_8am, country_name: 'France')
+ create(:point, user: user, timestamp: jan_1_9am, country_name: 'France')
+ create(:point, user: user, timestamp: jan_1_10am, country_name: 'Germany')
+ create(:point, user: user, timestamp: jan_1_11am, country_name: 'Germany')
+
+ digest = calculate_digest
+ countries = digest.time_spent_by_location['countries']
+
+ france = countries.find { |c| c['name'] == 'France' }
+ germany = countries.find { |c| c['name'] == 'Germany' }
+
+ # France span: 3600 seconds, Germany span: 3600 seconds
+ # Total spans: 7200 seconds
+ # Each gets 50% of 1440 = 720 minutes
+ expect(france['minutes']).to eq(720)
+ expect(germany['minutes']).to eq(720)
+ # Total = 1440 (exactly one day) - NOT 2 days as the bug would have caused
+ expect(france['minutes'] + germany['minutes']).to eq(1440)
+ end
+ end
+
context 'when digest already exists' do
let!(:existing_digest) do
create(:users_digest, user: user, year: 2024, period_type: :yearly, distance: 10_000)
diff --git a/spec/services/users/safe_settings_spec.rb b/spec/services/users/safe_settings_spec.rb
index 20411a94..f8f18530 100644
--- a/spec/services/users/safe_settings_spec.rb
+++ b/spec/services/users/safe_settings_spec.rb
@@ -31,7 +31,8 @@ RSpec.describe Users::SafeSettings do
speed_color_scale: nil,
fog_of_war_threshold: nil,
enabled_map_layers: %w[Routes Heatmap],
- maps_maplibre_style: 'light'
+ maps_maplibre_style: 'light',
+ globe_projection: false
}
)
end
@@ -82,7 +83,8 @@ RSpec.describe Users::SafeSettings do
'visits_suggestions_enabled' => false,
'enabled_map_layers' => %w[Points Routes Areas Photos],
'maps_maplibre_style' => 'light',
- 'digest_emails_enabled' => true
+ 'digest_emails_enabled' => true,
+ 'globe_projection' => false
}
)
end
@@ -110,7 +112,8 @@ RSpec.describe Users::SafeSettings do
speed_color_scale: nil,
fog_of_war_threshold: nil,
enabled_map_layers: %w[Points Routes Areas Photos],
- maps_maplibre_style: 'light'
+ maps_maplibre_style: 'light',
+ globe_projection: false
}
)
end