Update time spent calculation for country minutes in user digests

* Update digest calculation to use actual time spent in countries based on consecutive points, avoiding double-counting days when crossing borders.

* Move methods to private

app/models/user.rb

@@ -45,13 +45,18 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
 
   def countries_visited
     Rails.cache.fetch("dawarich/user_#{id}_countries_visited", expires_in: 1.day) do
-      countries_visited_uncached
+      points
+        .without_raw_data
+        .where.not(country_name: [nil, ''])
+        .distinct
+        .pluck(:country_name)
+        .compact
     end
   end
 
   def cities_visited
     Rails.cache.fetch("dawarich/user_#{id}_cities_visited", expires_in: 1.day) do
-      cities_visited_uncached
+      points.where.not(city: [nil, '']).distinct.pluck(:city).compact
     end
   end
 
@@ -134,47 +139,17 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
     Time.zone.name
   end
 
-  # Aggregate countries from all stats' toponyms
-  # This is more accurate than raw point queries as it uses processed data
   def countries_visited_uncached
-    countries = Set.new
-
-    stats.find_each do |stat|
-      toponyms = stat.toponyms
-      next unless toponyms.is_a?(Array)
-
-      toponyms.each do |toponym|
-        next unless toponym.is_a?(Hash)
-
-        countries.add(toponym['country']) if toponym['country'].present?
-      end
-    end
-
-    countries.to_a.sort
+    points
+      .without_raw_data
+      .where.not(country_name: [nil, ''])
+      .distinct
+      .pluck(:country_name)
+      .compact
   end
 
-  # Aggregate cities from all stats' toponyms
-  # This respects MIN_MINUTES_SPENT_IN_CITY since toponyms are already filtered
   def cities_visited_uncached
-    cities = Set.new
-
-    stats.find_each do |stat|
-      toponyms = stat.toponyms
-      next unless toponyms.is_a?(Array)
-
-      toponyms.each do |toponym|
-        next unless toponym.is_a?(Hash)
-        next unless toponym['cities'].is_a?(Array)
-
-        toponym['cities'].each do |city|
-          next unless city.is_a?(Hash)
-
-          cities.add(city['city']) if city['city'].present?
-        end
-      end
-    end
-
-    cities.to_a.sort
+    points.where.not(city: [nil, '']).distinct.pluck(:city).compact
   end
 
   def home_place_coordinates

app/serializers/api/user_serializer.rb

@@ -42,8 +42,7 @@ class Api::UserSerializer
       photoprism_url: user.safe_settings.photoprism_url,
       visits_suggestions_enabled: user.safe_settings.visits_suggestions_enabled?,
       speed_color_scale: user.safe_settings.speed_color_scale,
-      fog_of_war_threshold: user.safe_settings.fog_of_war_threshold,
-      globe_projection: user.safe_settings.globe_projection
+      fog_of_war_threshold: user.safe_settings.fog_of_war_threshold
     }
   end
 

app/services/users/digests/calculate_year.rb

@@ -216,8 +216,8 @@ module Users
 
       def calculate_all_time_stats
         {
-          'total_countries' => user.countries_visited_uncached.size,
-          'total_cities' => user.cities_visited_uncached.size,
+          'total_countries' => user.countries_visited.count,
+          'total_cities' => user.cities_visited.count,
           'total_distance' => user.stats.sum(:distance).to_s
         }
       end

spec/models/user_spec.rb

@@ -163,16 +163,12 @@ RSpec.describe User, type: :model do
     describe '#countries_visited' do
       subject { user.countries_visited }
 
-      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
+      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: '') }
 
-      it 'returns array of countries from stats toponyms' do
+      it 'returns array of countries' do
         expect(subject).to include('Germany', 'France')
         expect(subject.count).to eq(2)
       end
@@ -185,18 +181,12 @@ RSpec.describe User, type: :model do
     describe '#cities_visited' do
       subject { user.cities_visited }
 
-      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
+      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: '') }
 
-      it 'returns array of cities from stats toponyms' do
+      it 'returns array of cities' do
         expect(subject).to include('Berlin', 'Paris')
         expect(subject.count).to eq(2)
       end
@@ -220,15 +210,11 @@ RSpec.describe User, type: :model do
     describe '#total_countries' do
       subject { user.total_countries }
 
-      let!(:stat) do
-        create(:stat, user:, toponyms: [
-                 { 'country' => 'Germany', 'cities' => [] },
-                 { 'country' => 'France', 'cities' => [] },
-                 { 'country' => nil, 'cities' => [] }
-               ])
-      end
+      let!(:point1) { create(:point, user:, country_name: 'Germany') }
+      let!(:point2) { create(:point, user:, country_name: 'France') }
+      let!(:point3) { create(:point, user:, country_name: nil) }
 
-      it 'returns number of countries from stats toponyms' do
+      it 'returns number of countries' do
         expect(subject).to eq(2)
       end
     end
@@ -236,17 +222,11 @@ RSpec.describe User, type: :model do
     describe '#total_cities' do
       subject { user.total_cities }
 
-      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
+      let!(:point1) { create(:point, user:, city: 'Berlin') }
+      let!(:point2) { create(:point, user:, city: 'Paris') }
+      let!(:point3) { create(:point, user:, city: nil) }
 
-      it 'returns number of cities from stats toponyms' do
+      it 'returns number of cities' do
         expect(subject).to eq(2)
       end
     end