Merge branch 'dev' into feature/yearly-digest

app/controllers/exports_controller.rb

@@ -7,7 +7,7 @@ class ExportsController < ApplicationController
   before_action :set_export, only: %i[destroy]
 
   def index
-    @exports = current_user.exports.order(created_at: :desc).page(params[:page])
+    @exports = current_user.exports.with_attached_file.order(created_at: :desc).page(params[:page])
   end
 
   def create

app/controllers/imports_controller.rb

@@ -14,6 +14,7 @@ class ImportsController < ApplicationController
   def index
     @imports = policy_scope(Import)
                .select(:id, :name, :source, :created_at, :processed, :status)
+               .with_attached_file
                .order(created_at: :desc)
                .page(params[:page])
   end

app/models/user.rb

@@ -74,7 +74,7 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
   end
 
   def total_reverse_geocoded_points
-    points.where.not(reverse_geocoded_at: nil).count
+    StatsQuery.new(self).points_stats[:geocoded]
   end
 
   def total_reverse_geocoded_points_without_data

app/serializers/stats_serializer.rb

@@ -27,7 +27,7 @@ class StatsSerializer
   end
 
   def reverse_geocoded_points
-    user.points.reverse_geocoded.count
+    StatsQuery.new(user).points_stats[:geocoded]
   end
 
   def yearly_stats

app/services/countries_and_cities.rb

@@ -10,8 +10,8 @@ class CountriesAndCities
 
   def call
     points
-      .reject { |point| point.country_name.nil? || point.city.nil? }
-      .group_by(&:country_name)
+      .reject { |point| point[:country_name].nil? || point[:city].nil? }
+      .group_by { |point| point[:country_name] }
       .transform_values { |country_points| process_country_points(country_points) }
       .map { |country, cities| CountryData.new(country: country, cities: cities) }
   end
@@ -22,7 +22,7 @@ class CountriesAndCities
 
   def process_country_points(country_points)
     country_points
-      .group_by(&:city)
+      .group_by { |point| point[:city] }
       .transform_values { |city_points| create_city_data_if_valid(city_points) }
       .values
       .compact
@@ -31,7 +31,7 @@ class CountriesAndCities
   def create_city_data_if_valid(city_points)
     timestamps = city_points.pluck(:timestamp)
     duration = calculate_duration_in_minutes(timestamps)
-    city = city_points.first.city
+    city = city_points.first[:city]
     points_count = city_points.size
 
     build_city_data(city, points_count, timestamps, duration)

app/services/reverse_geocoding/places/fetch_data.rb

@@ -48,7 +48,6 @@ class ReverseGeocoding::Places::FetchData
     )
   end
 
-
   def find_place(place_data, existing_places)
     osm_id = place_data['properties']['osm_id'].to_s
 
@@ -82,9 +81,9 @@ class ReverseGeocoding::Places::FetchData
 
   def find_existing_places(osm_ids)
     Place.where("geodata->'properties'->>'osm_id' IN (?)", osm_ids)
-      .global
-      .index_by { |p| p.geodata.dig('properties', 'osm_id').to_s }
-      .compact
+         .global
+         .index_by { |p| p.geodata.dig('properties', 'osm_id').to_s }
+         .compact
   end
 
   def prepare_places_for_bulk_operations(places, existing_places)
@@ -114,9 +113,9 @@ class ReverseGeocoding::Places::FetchData
     place.geodata = data
     place.source = :photon
 
-    if place.lonlat.blank?
-      place.lonlat = build_point_coordinates(data['geometry']['coordinates'])
-    end
+    return if place.lonlat.present?
+
+    place.lonlat = build_point_coordinates(data['geometry']['coordinates'])
   end
 
   def save_places(places_to_create, places_to_update)
@@ -138,8 +137,23 @@ class ReverseGeocoding::Places::FetchData
       Place.insert_all(place_attributes)
     end
 
-    # Individual updates for existing places
-    places_to_update.each(&:save!) if places_to_update.any?
+    return unless places_to_update.any?
+
+    update_attributes = places_to_update.map do |place|
+      {
+        id: place.id,
+        name: place.name,
+        latitude: place.latitude,
+        longitude: place.longitude,
+        lonlat: place.lonlat,
+        city: place.city,
+        country: place.country,
+        geodata: place.geodata,
+        source: place.source,
+        updated_at: Time.current
+      }
+    end
+    Place.upsert_all(update_attributes, unique_by: :id)
   end
 
   def build_point_coordinates(coordinates)
@@ -147,7 +161,7 @@ class ReverseGeocoding::Places::FetchData
   end
 
   def geocoder_places
-    data = Geocoder.search(
+    Geocoder.search(
       [place.lat, place.lon],
       limit: 10,
       distance_sort: true,

app/views/map/maplibre/_settings_panel.html.erb

@@ -72,7 +72,7 @@
                    data-maps--maplibre-target="searchInput"
                    autocomplete="off" />
             <!-- Search Results -->
-            <div class="absolute z-50 w-full mt-1 bg-base-100 rounded-lg shadow-lg border border-base-300 hidden max-h-full overflow-y-auto"
+            <div class="absolute z-50 w-full mt-1 bg-base-100 rounded-lg shadow-lg border border-base-300 hidden max-height:400px;  overflow-y-auto"
                  data-maps--maplibre-target="searchResults">
               <!-- Results will be populated by SearchManager -->
             </div>

db/migrate/20251228000000_remove_unused_indexes.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RemoveUnusedIndexes < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    remove_index :points, :geodata, algorithm: :concurrently, if_exists: true
+    remove_index :points, %i[latitude longitude], algorithm: :concurrently, if_exists: true
+    remove_index :points, :altitude, algorithm: :concurrently, if_exists: true
+    remove_index :points, :city, algorithm: :concurrently, if_exists: true
+    remove_index :points, :country_name, algorithm: :concurrently, if_exists: true
+    remove_index :points, :battery_status, algorithm: :concurrently, if_exists: true
+    remove_index :points, :connection, algorithm: :concurrently, if_exists: true
+    remove_index :points, :trigger, algorithm: :concurrently, if_exists: true
+    remove_index :points, :battery, algorithm: :concurrently, if_exists: true
+    remove_index :points, :country, algorithm: :concurrently, if_exists: true
+    remove_index :points, :external_track_id, algorithm: :concurrently, if_exists: true
+  end
+end

db/migrate/20251228100000_add_performance_indexes.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class AddPerformanceIndexes < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    # Query: SELECT * FROM users WHERE api_key = $1
+    add_index :users, :api_key,
+              algorithm: :concurrently,
+              if_not_exists: true
+
+    # Query: SELECT id FROM users WHERE status = $1
+    add_index :users, :status,
+              algorithm: :concurrently,
+              if_not_exists: true
+
+    # Query: SELECT DISTINCT city FROM points WHERE user_id = $1 AND city IS NOT NULL
+    add_index :points, %i[user_id city],
+              name: 'idx_points_user_city',
+              algorithm: :concurrently,
+              if_not_exists: true
+
+    # Query: SELECT 1 FROM points WHERE user_id = $1 AND visit_id IS NULL AND timestamp BETWEEN...
+    add_index :points, %i[user_id timestamp],
+              name: 'idx_points_user_visit_null_timestamp',
+              where: 'visit_id IS NULL',
+              algorithm: :concurrently,
+              if_not_exists: true
+  end
+end

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_27_223614) do
+ActiveRecord::Schema[8.0].define(version: 2025_12_28_100000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "postgis"
@@ -249,18 +249,8 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_27_223614) do
     t.string "country_name"
     t.boolean "raw_data_archived", default: false, null: false
     t.bigint "raw_data_archive_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"
-    t.index ["city"], name: "index_points_on_city"
-    t.index ["connection"], name: "index_points_on_connection"
-    t.index ["country"], name: "index_points_on_country"
     t.index ["country_id"], name: "index_points_on_country_id"
-    t.index ["country_name"], name: "index_points_on_country_name"
-    t.index ["external_track_id"], name: "index_points_on_external_track_id"
-    t.index ["geodata"], name: "index_points_on_geodata", using: :gin
     t.index ["import_id"], name: "index_points_on_import_id"
-    t.index ["latitude", "longitude"], name: "index_points_on_latitude_and_longitude"
     t.index ["lonlat", "timestamp", "user_id"], name: "index_points_on_lonlat_timestamp_user_id", unique: true
     t.index ["lonlat"], name: "index_points_on_lonlat", using: :gist
     t.index ["raw_data_archive_id"], name: "index_points_on_raw_data_archive_id"
@@ -268,10 +258,11 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_27_223614) do
     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", "city"], name: "idx_points_user_city"
     t.index ["user_id", "country_name"], name: "idx_points_user_country_name"
     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)"
     t.index ["user_id", "timestamp"], name: "index_points_on_user_id_and_timestamp", order: { timestamp: :desc }
     t.index ["user_id"], name: "index_points_on_user_id"
     t.index ["visit_id"], name: "index_points_on_visit_id"
@@ -396,9 +387,11 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_27_223614) do
     t.string "utm_campaign"
     t.string "utm_term"
     t.string "utm_content"
+    t.index ["api_key"], name: "index_users_on_api_key"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["provider", "uid"], name: "index_users_on_provider_and_uid", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+    t.index ["status"], name: "index_users_on_status"
   end
 
   add_check_constraint "users", "admin IS NOT NULL", name: "users_admin_null", validate: false