From 5455228b80b3e1bd9919424dd8d41e8efe6f5c8c Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Sun, 28 Dec 2025 20:55:57 +0100
Subject: [PATCH] Bring points_count to integer

---
 app/jobs/bulk_visits_suggesting_job.rb                       | 2 +-
 app/jobs/tracks/daily_generation_job.rb                      | 2 +-
 app/queries/stats_query.rb                                   | 2 +-
 app/services/imports/destroy.rb                              | 2 +-
 app/services/points_limit_exceeded.rb                        | 2 +-
 app/services/users/export_data.rb                            | 2 +-
 app/views/devise/registrations/_points_usage.html.erb        | 4 ++--
 app/views/settings/users/index.html.erb                      | 2 +-
 db/migrate/20251206000001_create_points_raw_data_archives.rb | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/jobs/bulk_visits_suggesting_job.rb b/app/jobs/bulk_visits_suggesting_job.rb
index e52b06da..5ffd9232 100644
--- a/app/jobs/bulk_visits_suggesting_job.rb
+++ b/app/jobs/bulk_visits_suggesting_job.rb
@@ -18,7 +18,7 @@ class BulkVisitsSuggestingJob < ApplicationJob
 
     users.active.find_each do |user|
       next unless user.safe_settings.visits_suggestions_enabled?
-      next unless user.points_count.positive?
+      next unless user.points_count&.positive?
 
       schedule_chunked_jobs(user, time_chunks)
     end
diff --git a/app/jobs/tracks/daily_generation_job.rb b/app/jobs/tracks/daily_generation_job.rb
index 095199c1..1a6958eb 100644
--- a/app/jobs/tracks/daily_generation_job.rb
+++ b/app/jobs/tracks/daily_generation_job.rb
@@ -21,7 +21,7 @@ class Tracks::DailyGenerationJob < ApplicationJob
 
   def perform
     User.active_or_trial.find_each do |user|
-      next if user.points_count.zero?
+      next if user.points_count&.zero?
 
       process_user_daily_tracks(user)
     rescue StandardError => e
diff --git a/app/queries/stats_query.rb b/app/queries/stats_query.rb
index a2fe5c10..60dbf3a5 100644
--- a/app/queries/stats_query.rb
+++ b/app/queries/stats_query.rb
@@ -11,7 +11,7 @@ class StatsQuery
     end
 
     {
-      total: user.points_count,
+      total: user.points_count.to_i,
       geocoded: cached_stats[:geocoded],
       without_data: cached_stats[:without_data]
     }
diff --git a/app/services/imports/destroy.rb b/app/services/imports/destroy.rb
index 24db4a40..88f824ea 100644
--- a/app/services/imports/destroy.rb
+++ b/app/services/imports/destroy.rb
@@ -9,7 +9,7 @@ class Imports::Destroy
   end
 
   def call
-    points_count = @import.points_count
+    points_count = @import.points_count.to_i
 
     ActiveRecord::Base.transaction do
       @import.points.destroy_all
diff --git a/app/services/points_limit_exceeded.rb b/app/services/points_limit_exceeded.rb
index 21cb802a..c014e45d 100644
--- a/app/services/points_limit_exceeded.rb
+++ b/app/services/points_limit_exceeded.rb
@@ -9,7 +9,7 @@ class PointsLimitExceeded
     return false if DawarichSettings.self_hosted?
 
     Rails.cache.fetch(cache_key, expires_in: 1.day) do
-      @user.points_count >= points_limit
+      @user.points_count.to_i >= points_limit
     end
   end
 
diff --git a/app/services/users/export_data.rb b/app/services/users/export_data.rb
index 80e6c486..52f9c308 100644
--- a/app/services/users/export_data.rb
+++ b/app/services/users/export_data.rb
@@ -323,7 +323,7 @@ class Users::ExportData
       trips: user.trips.count,
       stats: user.stats.count,
       notifications: user.notifications.count,
-      points: user.points_count,
+      points: user.points_count.to_i,
       visits: user.visits.count,
       places: user.visited_places.count
     }
diff --git a/app/views/devise/registrations/_points_usage.html.erb b/app/views/devise/registrations/_points_usage.html.erb
index 68880d0d..f710865d 100644
--- a/app/views/devise/registrations/_points_usage.html.erb
+++ b/app/views/devise/registrations/_points_usage.html.erb
@@ -1,6 +1,6 @@
 <p class="py-6">
   <p class='py-2'>
-    You have used <%= number_with_delimiter(current_user.points_count) %> points of <%= number_with_delimiter(DawarichSettings::BASIC_PAID_PLAN_LIMIT) %> available.
+    You have used <%= number_with_delimiter(current_user.points_count.to_i) %> points of <%= number_with_delimiter(DawarichSettings::BASIC_PAID_PLAN_LIMIT) %> available.
   </p>
-  <progress class="progress progress-primary w-1/2 h-5" value="<%= current_user.points_count %>" max="<%= DawarichSettings::BASIC_PAID_PLAN_LIMIT %>"></progress>
+  <progress class="progress progress-primary w-1/2 h-5" value="<%= current_user.points_count.to_i %>" max="<%= DawarichSettings::BASIC_PAID_PLAN_LIMIT %>"></progress>
 </p>
diff --git a/app/views/settings/users/index.html.erb b/app/views/settings/users/index.html.erb
index c4c6aea0..424bc83c 100644
--- a/app/views/settings/users/index.html.erb
+++ b/app/views/settings/users/index.html.erb
@@ -24,7 +24,7 @@
                 </div>
               </td>
               <td>
-                <%= number_with_delimiter user.points_count %>
+                <%= number_with_delimiter user.points_count.to_i %>
               </td>
               <td>
                 <%= human_datetime(user.created_at) %>
diff --git a/db/migrate/20251206000001_create_points_raw_data_archives.rb b/db/migrate/20251206000001_create_points_raw_data_archives.rb
index 59990482..122abe2b 100644
--- a/db/migrate/20251206000001_create_points_raw_data_archives.rb
+++ b/db/migrate/20251206000001_create_points_raw_data_archives.rb
@@ -16,7 +16,7 @@ class CreatePointsRawDataArchives < ActiveRecord::Migration[8.0]
     end
 
     add_index :points_raw_data_archives, :user_id
-    add_index :points_raw_data_archives, [:user_id, :year, :month]
+    add_index :points_raw_data_archives, %i[user_id year month]
     add_index :points_raw_data_archives, :archived_at
     add_foreign_key :points_raw_data_archives, :users, validate: false
   end