The only location history tracker you'll ever need.
- <%= link_to 'Sign up', new_user_registration_path, class: "rounded-lg py-3 px-5 my-3 bg-blue-600 text-white block font-medium" %> -<%= stat.distance %><%= DISTANCE_UNIT %>
+<%= number_with_delimiter stat.distance %><%= DISTANCE_UNIT %>
<% if DawarichSettings.reverse_geocoding_enabled? %><% cache [current_user, 'year_distance_stat', year], skip_digest: true do %> diff --git a/config/initializers/01_constants.rb b/config/initializers/01_constants.rb index 6a475aa2..1f3203da 100644 --- a/config/initializers/01_constants.rb +++ b/config/initializers/01_constants.rb @@ -17,6 +17,7 @@ NOMINATIM_API_KEY = ENV.fetch('NOMINATIM_API_KEY', nil) NOMINATIM_API_USE_HTTPS = ENV.fetch('NOMINATIM_API_USE_HTTPS', 'true') == 'true' GEOAPIFY_API_KEY = ENV.fetch('GEOAPIFY_API_KEY', nil) +STORE_GEODATA = ENV.fetch('STORE_GEODATA', 'false') == 'true' # /Reverse geocoding settings SENTRY_DSN = ENV.fetch('SENTRY_DSN', nil) diff --git a/config/initializers/03_dawarich_settings.rb b/config/initializers/03_dawarich_settings.rb index 96ee30ee..19f7394e 100644 --- a/config/initializers/03_dawarich_settings.rb +++ b/config/initializers/03_dawarich_settings.rb @@ -32,5 +32,9 @@ class DawarichSettings def nominatim_enabled? @nominatim_enabled ||= NOMINATIM_API_HOST.present? end + + def store_geodata? + @store_geodata ||= STORE_GEODATA + end end end diff --git a/db/migrate/20250513164521_add_visited_countries_to_trips.rb b/db/migrate/20250513164521_add_visited_countries_to_trips.rb new file mode 100644 index 00000000..27072d3e --- /dev/null +++ b/db/migrate/20250513164521_add_visited_countries_to_trips.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddVisitedCountriesToTrips < ActiveRecord::Migration[8.0] + def change + add_column :trips, :visited_countries, :jsonb, default: [] + end +end diff --git a/db/schema.rb b/db/schema.rb index 68eac3a8..85f06f62 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,264 +10,262 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 20_250_404_182_437) do +ActiveRecord::Schema[8.0].define(version: 2025_05_13_164521) do # These are extensions that must be enabled in order to support this database - enable_extension 'pg_catalog.plpgsql' - enable_extension 'postgis' + enable_extension "pg_catalog.plpgsql" + enable_extension "postgis" - create_table 'action_text_rich_texts', force: :cascade do |t| - t.string 'name', null: false - t.text 'body' - t.string 'record_type', null: false - t.bigint 'record_id', null: false - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.index %w[record_type record_id name], name: 'index_action_text_rich_texts_uniqueness', unique: true + create_table "action_text_rich_texts", force: :cascade do |t| + t.string "name", null: false + t.text "body" + t.string "record_type", null: false + t.bigint "record_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true end - create_table 'active_storage_attachments', force: :cascade do |t| - t.string 'name', null: false - t.string 'record_type', null: false - t.bigint 'record_id', null: false - t.bigint 'blob_id', null: false - t.datetime 'created_at', null: false - t.index ['blob_id'], name: 'index_active_storage_attachments_on_blob_id' - t.index %w[record_type record_id name blob_id], name: 'index_active_storage_attachments_uniqueness', -unique: true + create_table "active_storage_attachments", force: :cascade do |t| + t.string "name", null: false + t.string "record_type", null: false + t.bigint "record_id", null: false + t.bigint "blob_id", null: false + t.datetime "created_at", null: false + t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" + t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true end - create_table 'active_storage_blobs', force: :cascade do |t| - t.string 'key', null: false - t.string 'filename', null: false - t.string 'content_type' - t.text 'metadata' - t.string 'service_name', null: false - t.bigint 'byte_size', null: false - t.string 'checksum' - t.datetime 'created_at', null: false - t.index ['key'], name: 'index_active_storage_blobs_on_key', unique: true + create_table "active_storage_blobs", force: :cascade do |t| + t.string "key", null: false + t.string "filename", null: false + t.string "content_type" + t.text "metadata" + t.string "service_name", null: false + t.bigint "byte_size", null: false + t.string "checksum" + t.datetime "created_at", null: false + t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true end - create_table 'active_storage_variant_records', force: :cascade do |t| - t.bigint 'blob_id', null: false - t.string 'variation_digest', null: false - t.index %w[blob_id variation_digest], name: 'index_active_storage_variant_records_uniqueness', unique: true + create_table "active_storage_variant_records", force: :cascade do |t| + t.bigint "blob_id", null: false + t.string "variation_digest", null: false + t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true end - create_table 'areas', force: :cascade do |t| - t.string 'name', null: false - t.bigint 'user_id', null: false - t.decimal 'longitude', precision: 10, scale: 6, null: false - t.decimal 'latitude', precision: 10, scale: 6, null: false - t.integer 'radius', null: false - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.index ['user_id'], name: 'index_areas_on_user_id' + create_table "areas", force: :cascade do |t| + t.string "name", null: false + t.bigint "user_id", null: false + t.decimal "longitude", precision: 10, scale: 6, null: false + t.decimal "latitude", precision: 10, scale: 6, null: false + t.integer "radius", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_areas_on_user_id" end - create_table 'data_migrations', primary_key: 'version', id: :string, force: :cascade do |t| + create_table "data_migrations", primary_key: "version", id: :string, force: :cascade do |t| end - create_table 'exports', force: :cascade do |t| - t.string 'name', null: false - t.string 'url' - t.integer 'status', default: 0, null: false - t.bigint 'user_id', null: false - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.integer 'file_format', default: 0 - t.datetime 'start_at' - t.datetime 'end_at' - t.index ['status'], name: 'index_exports_on_status' - t.index ['user_id'], name: 'index_exports_on_user_id' + create_table "exports", force: :cascade do |t| + t.string "name", null: false + t.string "url" + t.integer "status", default: 0, null: false + t.bigint "user_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "file_format", default: 0 + t.datetime "start_at" + t.datetime "end_at" + t.index ["status"], name: "index_exports_on_status" + t.index ["user_id"], name: "index_exports_on_user_id" end - create_table 'imports', force: :cascade do |t| - t.string 'name', null: false - t.bigint 'user_id', null: false - t.integer 'source', default: 0 - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.integer 'raw_points', default: 0 - t.integer 'doubles', default: 0 - t.integer 'processed', default: 0 - t.jsonb 'raw_data' - t.integer 'points_count', default: 0 - t.index ['source'], name: 'index_imports_on_source' - t.index ['user_id'], name: 'index_imports_on_user_id' + create_table "imports", force: :cascade do |t| + t.string "name", null: false + t.bigint "user_id", null: false + t.integer "source", default: 0 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "raw_points", default: 0 + t.integer "doubles", default: 0 + t.integer "processed", default: 0 + t.jsonb "raw_data" + t.integer "points_count", default: 0 + t.index ["source"], name: "index_imports_on_source" + t.index ["user_id"], name: "index_imports_on_user_id" end - create_table 'notifications', force: :cascade do |t| - t.string 'title', null: false - t.text 'content', null: false - t.bigint 'user_id', null: false - t.integer 'kind', default: 0, null: false - t.datetime 'read_at' - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.index ['kind'], name: 'index_notifications_on_kind' - t.index ['user_id'], name: 'index_notifications_on_user_id' + create_table "notifications", force: :cascade do |t| + t.string "title", null: false + t.text "content", null: false + t.bigint "user_id", null: false + t.integer "kind", default: 0, null: false + t.datetime "read_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["kind"], name: "index_notifications_on_kind" + t.index ["user_id"], name: "index_notifications_on_user_id" end - create_table 'place_visits', force: :cascade do |t| - t.bigint 'place_id', null: false - t.bigint 'visit_id', null: false - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.index ['place_id'], name: 'index_place_visits_on_place_id' - t.index ['visit_id'], name: 'index_place_visits_on_visit_id' + create_table "place_visits", force: :cascade do |t| + t.bigint "place_id", null: false + t.bigint "visit_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["place_id"], name: "index_place_visits_on_place_id" + t.index ["visit_id"], name: "index_place_visits_on_visit_id" end - create_table 'places', force: :cascade do |t| - t.string 'name', null: false - t.decimal 'longitude', precision: 10, scale: 6, null: false - t.decimal 'latitude', precision: 10, scale: 6, null: false - t.string 'city' - t.string 'country' - t.integer 'source', default: 0 - t.jsonb 'geodata', default: {}, null: false - t.datetime 'reverse_geocoded_at' - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.geography 'lonlat', limit: { srid: 4326, type: 'st_point', geographic: true } - t.index ['lonlat'], name: 'index_places_on_lonlat', using: :gist + create_table "places", force: :cascade do |t| + t.string "name", null: false + t.decimal "longitude", precision: 10, scale: 6, null: false + t.decimal "latitude", precision: 10, scale: 6, null: false + t.string "city" + t.string "country" + t.integer "source", default: 0 + t.jsonb "geodata", default: {}, null: false + t.datetime "reverse_geocoded_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.geography "lonlat", limit: {srid: 4326, type: "st_point", geographic: true} + t.index ["lonlat"], name: "index_places_on_lonlat", using: :gist end - create_table 'points', force: :cascade do |t| - t.integer 'battery_status' - t.string 'ping' - t.integer 'battery' - t.string 'tracker_id' - t.string 'topic' - t.integer 'altitude' - t.decimal 'longitude', precision: 10, scale: 6 - t.string 'velocity' - t.integer 'trigger' - t.string 'bssid' - t.string 'ssid' - t.integer 'connection' - t.integer 'vertical_accuracy' - t.integer 'accuracy' - t.integer 'timestamp' - t.decimal 'latitude', precision: 10, scale: 6 - t.integer 'mode' - t.text 'inrids', default: [], array: true - t.text 'in_regions', default: [], array: true - t.jsonb 'raw_data', default: {} - t.bigint 'import_id' - t.string 'city' - t.string 'country' - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.bigint 'user_id' - t.jsonb 'geodata', default: {}, null: false - t.bigint 'visit_id' - t.datetime 'reverse_geocoded_at' - t.decimal 'course', precision: 8, scale: 5 - t.decimal 'course_accuracy', precision: 8, scale: 5 - t.string 'external_track_id' - t.geography 'lonlat', limit: { srid: 4326, type: 'st_point', geographic: true } - 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 ['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 %w[latitude longitude], name: 'index_points_on_latitude_and_longitude' - t.index %w[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 ['reverse_geocoded_at'], name: 'index_points_on_reverse_geocoded_at' - t.index ['timestamp'], name: 'index_points_on_timestamp' - 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' + create_table "points", force: :cascade do |t| + t.integer "battery_status" + t.string "ping" + t.integer "battery" + t.string "tracker_id" + t.string "topic" + t.integer "altitude" + t.decimal "longitude", precision: 10, scale: 6 + t.string "velocity" + t.integer "trigger" + t.string "bssid" + t.string "ssid" + t.integer "connection" + t.integer "vertical_accuracy" + t.integer "accuracy" + t.integer "timestamp" + t.decimal "latitude", precision: 10, scale: 6 + t.integer "mode" + t.text "inrids", default: [], array: true + t.text "in_regions", default: [], array: true + t.jsonb "raw_data", default: {} + t.bigint "import_id" + t.string "city" + t.string "country" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "user_id" + t.jsonb "geodata", default: {}, null: false + t.bigint "visit_id" + t.datetime "reverse_geocoded_at" + t.decimal "course", precision: 8, scale: 5 + t.decimal "course_accuracy", precision: 8, scale: 5 + t.string "external_track_id" + t.geography "lonlat", limit: {srid: 4326, type: "st_point", geographic: true} + 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 ["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 ["reverse_geocoded_at"], name: "index_points_on_reverse_geocoded_at" + t.index ["timestamp"], name: "index_points_on_timestamp" + 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" end - create_table 'stats', force: :cascade do |t| - t.integer 'year', null: false - t.integer 'month', null: false - t.integer 'distance', null: false - t.jsonb 'toponyms' - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.bigint 'user_id', null: false - t.jsonb 'daily_distance', default: {} - t.index ['distance'], name: 'index_stats_on_distance' - t.index ['month'], name: 'index_stats_on_month' - t.index ['user_id'], name: 'index_stats_on_user_id' - t.index ['year'], name: 'index_stats_on_year' + create_table "stats", force: :cascade do |t| + t.integer "year", null: false + t.integer "month", null: false + t.integer "distance", null: false + t.jsonb "toponyms" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "user_id", null: false + t.jsonb "daily_distance", default: {} + t.index ["distance"], name: "index_stats_on_distance" + t.index ["month"], name: "index_stats_on_month" + t.index ["user_id"], name: "index_stats_on_user_id" + t.index ["year"], name: "index_stats_on_year" end - create_table 'trips', force: :cascade do |t| - t.string 'name', null: false - t.datetime 'started_at', null: false - t.datetime 'ended_at', null: false - t.integer 'distance' - t.bigint 'user_id', null: false - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.geometry 'path', limit: { srid: 3857, type: 'line_string' } - t.index ['user_id'], name: 'index_trips_on_user_id' + create_table "trips", force: :cascade do |t| + t.string "name", null: false + t.datetime "started_at", null: false + t.datetime "ended_at", null: false + t.integer "distance" + t.bigint "user_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.geometry "path", limit: {srid: 3857, type: "line_string"} + t.jsonb "visited_countries", default: [] + t.index ["user_id"], name: "index_trips_on_user_id" end - create_table 'users', force: :cascade do |t| - t.string 'email', default: '', null: false - t.string 'encrypted_password', default: '', null: false - t.string 'reset_password_token' - t.datetime 'reset_password_sent_at' - t.datetime 'remember_created_at' - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.string 'api_key', default: '', null: false - t.string 'theme', default: 'dark', null: false - t.jsonb 'settings', - default: { 'fog_of_war_meters' => '100', 'meters_between_routes' => '1000', -'minutes_between_routes' => '60' } - t.boolean 'admin', default: false - t.integer 'sign_in_count', default: 0, null: false - t.datetime 'current_sign_in_at' - t.datetime 'last_sign_in_at' - t.string 'current_sign_in_ip' - t.string 'last_sign_in_ip' - t.integer 'status', default: 0 - t.datetime 'active_until' - t.index ['email'], name: 'index_users_on_email', unique: true - t.index ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true + create_table "users", force: :cascade do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "api_key", default: "", null: false + t.string "theme", default: "dark", null: false + t.jsonb "settings", default: {"fog_of_war_meters" => "100", "meters_between_routes" => "1000", "minutes_between_routes" => "60"} + t.boolean "admin", default: false + t.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.integer "status", default: 0 + t.datetime "active_until" + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end - add_check_constraint 'users', 'admin IS NOT NULL', name: 'users_admin_null', validate: false + add_check_constraint "users", "admin IS NOT NULL", name: "users_admin_null", validate: false - create_table 'visits', force: :cascade do |t| - t.bigint 'area_id' - t.bigint 'user_id', null: false - t.datetime 'started_at', null: false - t.datetime 'ended_at', null: false - t.integer 'duration', null: false - t.string 'name', null: false - t.integer 'status', default: 0, null: false - t.datetime 'created_at', null: false - t.datetime 'updated_at', null: false - t.bigint 'place_id' - t.index ['area_id'], name: 'index_visits_on_area_id' - t.index ['place_id'], name: 'index_visits_on_place_id' - t.index ['started_at'], name: 'index_visits_on_started_at' - t.index ['user_id'], name: 'index_visits_on_user_id' + create_table "visits", force: :cascade do |t| + t.bigint "area_id" + t.bigint "user_id", null: false + t.datetime "started_at", null: false + t.datetime "ended_at", null: false + t.integer "duration", null: false + t.string "name", null: false + t.integer "status", default: 0, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "place_id" + t.index ["area_id"], name: "index_visits_on_area_id" + t.index ["place_id"], name: "index_visits_on_place_id" + t.index ["started_at"], name: "index_visits_on_started_at" + t.index ["user_id"], name: "index_visits_on_user_id" end - add_foreign_key 'active_storage_attachments', 'active_storage_blobs', column: 'blob_id' - add_foreign_key 'active_storage_variant_records', 'active_storage_blobs', column: 'blob_id' - add_foreign_key 'areas', 'users' - add_foreign_key 'notifications', 'users' - add_foreign_key 'place_visits', 'places' - add_foreign_key 'place_visits', 'visits' - add_foreign_key 'points', 'users' - add_foreign_key 'points', 'visits' - add_foreign_key 'stats', 'users' - add_foreign_key 'trips', 'users' - add_foreign_key 'visits', 'areas' - add_foreign_key 'visits', 'places' - add_foreign_key 'visits', 'users' + add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" + add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" + add_foreign_key "areas", "users" + add_foreign_key "notifications", "users" + add_foreign_key "place_visits", "places" + add_foreign_key "place_visits", "visits" + add_foreign_key "points", "users" + add_foreign_key "points", "visits" + add_foreign_key "stats", "users" + add_foreign_key "trips", "users" + add_foreign_key "visits", "areas" + add_foreign_key "visits", "places" + add_foreign_key "visits", "users" end diff --git a/docker/docker-compose.production.yml b/docker/docker-compose.production.yml index 8dbf3f28..b1084423 100644 --- a/docker/docker-compose.production.yml +++ b/docker/docker-compose.production.yml @@ -70,6 +70,7 @@ services: PROMETHEUS_EXPORTER_PORT: 9394 SECRET_KEY_BASE: 1234567890 RAILS_LOG_TO_STDOUT: "true" + STORE_GEODATA: "false" logging: driver: "json-file" options: @@ -124,6 +125,7 @@ services: PROMETHEUS_EXPORTER_PORT: 9394 SECRET_KEY_BASE: 1234567890 RAILS_LOG_TO_STDOUT: "true" + STORE_GEODATA: "false" logging: driver: "json-file" options: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index bfadcb5a..97070e16 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -70,6 +70,7 @@ services: PROMETHEUS_EXPORTER_HOST: 0.0.0.0 PROMETHEUS_EXPORTER_PORT: 9394 SELF_HOSTED: "true" + STORE_GEODATA: "false" logging: driver: "json-file" options: @@ -122,6 +123,7 @@ services: PROMETHEUS_EXPORTER_HOST: dawarich_app PROMETHEUS_EXPORTER_PORT: 9394 SELF_HOSTED: "true" + STORE_GEODATA: "false" logging: driver: "json-file" options: diff --git a/docs/synology/.env b/docs/synology/.env index cfc5f19b..2eab0f4d 100644 --- a/docs/synology/.env +++ b/docs/synology/.env @@ -7,6 +7,7 @@ MIN_MINUTES_SPENT_IN_CITY=60 APPLICATION_HOSTS=dawarich.example.synology.me TIME_ZONE=Europe/Berlin BACKGROUND_PROCESSING_CONCURRENCY=10 +STORE_GEODATA=false ################################################################################### # Database diff --git a/lib/tasks/points.rake b/lib/tasks/points.rake index 7e3a1993..7580688d 100644 --- a/lib/tasks/points.rake +++ b/lib/tasks/points.rake @@ -5,9 +5,7 @@ namespace :points do task migrate_to_lonlat: :environment do puts 'Updating points to use lonlat...' - points = - Point.where(longitude: nil, latitude: nil) - .select(:id, :longitude, :latitude, :raw_data, :user_id, :timestamp) + points = Point.where(longitude: nil, latitude: nil).without_raw_data points.find_each do |point| Points::RawDataLonlatExtractor.new(point).call diff --git a/spec/models/place_spec.rb b/spec/models/place_spec.rb index 6787c3f9..cf6852c4 100644 --- a/spec/models/place_spec.rb +++ b/spec/models/place_spec.rb @@ -21,15 +21,6 @@ RSpec.describe Place, type: :model do describe 'methods' do let(:place) { create(:place, :with_geodata) } - describe '#async_reverse_geocode' do - before { allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true) } - before { allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true) } - - it 'updates address' do - expect { place.async_reverse_geocode }.to have_enqueued_job(ReverseGeocodingJob).with('Place', place.id) - end - end - describe '#osm_id' do it 'returns the osm_id' do expect(place.osm_id).to eq(5_762_449_774) diff --git a/spec/models/point_spec.rb b/spec/models/point_spec.rb index 7f5f03e9..92f36f04 100644 --- a/spec/models/point_spec.rb +++ b/spec/models/point_spec.rb @@ -45,7 +45,10 @@ RSpec.describe Point, type: :model do describe '#async_reverse_geocode' do let(:point) { build(:point) } - before { allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true) } + before do + allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true) + allow(DawarichSettings).to receive(:store_geodata?).and_return(true) + end it 'enqueues ReverseGeocodeJob with correct arguments' do point.save @@ -61,6 +64,16 @@ RSpec.describe Point, type: :model do expect { point.async_reverse_geocode }.to have_enqueued_job(ReverseGeocodingJob) end end + + context 'when reverse geocoding is disabled' do + before do + allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(false) + end + + it 'does not enqueue ReverseGeocodeJob' do + expect { point.save }.not_to have_enqueued_job(ReverseGeocodingJob) + end + end end describe '#lon' do diff --git a/spec/models/trip_spec.rb b/spec/models/trip_spec.rb index f56daf20..7d17117d 100644 --- a/spec/models/trip_spec.rb +++ b/spec/models/trip_spec.rb @@ -3,6 +3,10 @@ require 'rails_helper' RSpec.describe Trip, type: :model do + before do + allow_any_instance_of(Trips::Countries).to receive(:call).and_return([]) + end + describe 'validations' do it { is_expected.to validate_presence_of(:name) } it { is_expected.to validate_presence_of(:started_at) } @@ -25,6 +29,26 @@ RSpec.describe Trip, type: :model do it 'sets the path' do expect(trip.path).to be_present end + + context 'when DawarichSettings.store_geodata is enabled' do + before do + allow(DawarichSettings).to receive(:store_geodata?).and_return(true) + end + + it 'sets the countries' do + expect(trip.countries).to eq(trip.points.pluck(:country).uniq.compact) + end + end + + context 'when DawarichSettings.store_geodata is disabled' do + it 'sets the visited countries' do + countries_service = instance_double(Trips::Countries, call: []) + expect(Trips::Countries).to receive(:new).with(trip).and_return(countries_service) + expect(countries_service).to receive(:call) + + trip.save + end + end end describe '#countries' do diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index ed2d0de6..15d0ef7c 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -38,6 +38,7 @@ RSpec.configure do |config| config.before do ActiveJob::Base.queue_adapter = :test + allow(DawarichSettings).to receive(:store_geodata?).and_return(true) end config.after(:suite) do diff --git a/spec/services/jobs/create_spec.rb b/spec/services/jobs/create_spec.rb index 84988ff3..ad28f498 100644 --- a/spec/services/jobs/create_spec.rb +++ b/spec/services/jobs/create_spec.rb @@ -4,7 +4,10 @@ require 'rails_helper' RSpec.describe Jobs::Create do describe '#call' do - before { allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true) } + before do + allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true) + allow(DawarichSettings).to receive(:store_geodata?).and_return(true) + end context 'when job_name is start_reverse_geocoding' do let(:user) { create(:user) } diff --git a/spec/services/reverse_geocoding/points/fetch_data_spec.rb b/spec/services/reverse_geocoding/points/fetch_data_spec.rb index ecef9bbb..c0f6de9c 100644 --- a/spec/services/reverse_geocoding/points/fetch_data_spec.rb +++ b/spec/services/reverse_geocoding/points/fetch_data_spec.rb @@ -9,8 +9,11 @@ RSpec.describe ReverseGeocoding::Points::FetchData do context 'when Geocoder returns city and country' do before do - allow(Geocoder).to receive(:search).and_return([double(city: 'City', country: 'Country', - data: { 'address' => 'Address' })]) + allow(Geocoder).to receive(:search).and_return( + [ + double(city: 'City', country: 'Country',data: { 'address' => 'Address' }) + ] + ) end context 'when point does not have city and country' do diff --git a/spec/services/trips/countries_spec.rb b/spec/services/trips/countries_spec.rb new file mode 100644 index 00000000..fc84ecf2 --- /dev/null +++ b/spec/services/trips/countries_spec.rb @@ -0,0 +1,93 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Trips::Countries do + let(:trip) { instance_double('Trip') } + let(:point1) { instance_double('Point', lonlat: factory.point(10.0, 50.0)) } + let(:point2) { instance_double('Point', lonlat: factory.point(20.0, 60.0)) } + let(:point3) { instance_double('Point', lonlat: factory.point(30.0, 70.0)) } + let(:point4) { instance_double('Point', lonlat: nil) } + let(:factory) { RGeo::Geographic.spherical_factory } + let(:points) { [point1, point2, point3, point4] } + + let(:geo_json_content) do + { + type: 'FeatureCollection', + features: [ + { + type: 'Feature', + properties: { ADMIN: 'Germany', ISO_A3: 'DEU', ISO_A2: 'DE' }, + geometry: { type: 'MultiPolygon', coordinates: [] } + } + ] + }.to_json + end + + before do + allow(trip).to receive(:points).and_return(points) + allow(File).to receive(:read).with(Trips::Countries::FILE_PATH).and_return(geo_json_content) + + # Explicitly stub all Geocoder calls with specific coordinates + allow(Geocoder).to receive(:search).and_return( + [double(data: { 'properties' => { 'countrycode' => 'DE' } })] + ) + allow(Geocoder).to receive(:search).with([50.0, 10.0], limit: 1).and_return( + [double(data: { 'properties' => { 'countrycode' => 'DE' } })] + ) + allow(Geocoder).to receive(:search).with([60.0, 20.0], limit: 1).and_return( + [double(data: { 'properties' => { 'countrycode' => 'SE' } })] + ) + allow(Geocoder).to receive(:search).with([70.0, 30.0], limit: 1).and_return( + [double(data: { 'properties' => { 'countrycode' => 'FI' } })] + ) + + allow(Rails.logger).to receive(:info) + allow(Rails.logger).to receive(:error) + end + + describe '#call' do + it 'returns a hash with country counts' do + allow(Thread).to receive(:new).and_yield + + result = described_class.new(trip).call + + expect(result).to match_array(%w[DE SE FI]) + end + + it 'handles points without coordinates' do + allow(Thread).to receive(:new).and_yield + + result = described_class.new(trip).call + + expect(result.size).to eq(3) # Should only count the 3 valid points + end + + it 'processes batches in multiple threads' do + expect(Thread).to receive(:new).at_least(:twice).and_yield + + described_class.new(trip).call + end + + it 'sorts countries by count in descending order' do + allow(Thread).to receive(:new).and_yield + allow(points).to receive(:to_a).and_return([point1, point1, point2, point3, point4]) + + result = described_class.new(trip).call + + expect(result.first).to eq('DE') + end + + context 'when an error occurs' do + before do + allow(Geocoder).to receive(:search).and_raise(Geocoder::Error, 'Error') + end + + it 'calls the exception reporter' do + expect(ExceptionReporter).to receive(:call).with(Geocoder::Error).at_least(3).times + + described_class.new(trip).call + end + end + end +end diff --git a/spec/services/visits/names/builder_spec.rb b/spec/services/visits/names/builder_spec.rb new file mode 100644 index 00000000..47d2586c --- /dev/null +++ b/spec/services/visits/names/builder_spec.rb @@ -0,0 +1,126 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Visits::Names::Builder do + describe '.build_from_properties' do + it 'builds a name from all available properties' do + properties = { + 'name' => 'Coffee Shop', + 'street' => 'Main St', + 'housenumber' => '123', + 'city' => 'New York', + 'state' => 'NY' + } + + result = described_class.build_from_properties(properties) + expect(result).to eq('Coffee Shop, Main St, 123, New York, NY') + end + + it 'handles missing properties' do + properties = { + 'name' => 'Coffee Shop', + 'city' => 'New York', + 'state' => 'NY' + } + + result = described_class.build_from_properties(properties) + expect(result).to eq('Coffee Shop, New York, NY') + end + + it 'deduplicates components' do + properties = { + 'name' => 'New York Cafe', + 'city' => 'New York', + 'state' => 'NY' + } + + result = described_class.build_from_properties(properties) + expect(result).to eq('New York Cafe, New York, NY') + end + + it 'returns nil for empty properties' do + result = described_class.build_from_properties({}) + expect(result).to be_nil + end + + it 'returns nil for nil properties' do + result = described_class.build_from_properties(nil) + expect(result).to be_nil + end + end + + describe '#call' do + subject { described_class.new(features, feature_type, name).call } + + let(:feature_type) { 'amenity' } + let(:name) { 'Coffee Shop' } + let(:features) do + [ + { + 'properties' => { + 'type' => 'amenity', + 'name' => 'Coffee Shop', + 'street' => '123 Main St', + 'city' => 'San Francisco', + 'state' => 'CA' + } + }, + { + 'properties' => { + 'type' => 'park', + 'name' => 'Central Park', + 'city' => 'New York', + 'state' => 'NY' + } + } + ] + end + + it 'returns a descriptive name with all available components' do + expect(subject).to eq('Coffee Shop, 123 Main St, San Francisco, CA') + end + + context 'when feature uses osm_value instead of type' do + let(:features) do + [ + { + 'properties' => { + 'osm_value' => 'amenity', + 'name' => 'Coffee Shop', + 'street' => '123 Main St', + 'city' => 'San Francisco', + 'state' => 'CA' + } + } + ] + end + + it 'finds the feature using osm_value' do + expect(subject).to eq('Coffee Shop, 123 Main St, San Francisco, CA') + end + end + + context 'when no matching feature is found' do + let(:name) { 'Non-existent Shop' } + + it 'returns nil' do + expect(subject).to be_nil + end + end + + context 'with empty inputs' do + it 'returns nil for empty features' do + expect(described_class.new([], feature_type, name).call).to be_nil + end + + it 'returns nil for blank feature_type' do + expect(described_class.new(features, '', name).call).to be_nil + end + + it 'returns nil for blank name' do + expect(described_class.new(features, feature_type, '').call).to be_nil + end + end + end +end diff --git a/spec/services/visits/names/suggester_spec.rb b/spec/services/visits/names/suggester_spec.rb new file mode 100644 index 00000000..d9361342 --- /dev/null +++ b/spec/services/visits/names/suggester_spec.rb @@ -0,0 +1,173 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Visits::Names::Suggester do + subject(:suggester) { described_class.new(points) } + + describe '#call' do + context 'when no points have geodata' do + let(:points) do + [ + double('Point', geodata: nil), + double('Point', geodata: {}) + ] + end + + it 'returns nil' do + expect(suggester.call).to be_nil + end + end + + context 'when points have geodata but no features' do + let(:points) do + [ + double('Point', geodata: { 'features' => [] }) + ] + end + + it 'returns nil' do + expect(suggester.call).to be_nil + end + end + + context 'when features exist but with different types' do + let(:points) do + [ + double( + 'Point', + geodata: { + 'features' => [ + { 'properties' => { 'type' => 'cafe', 'name' => 'Coffee Shop' } }, + { 'properties' => { 'type' => 'restaurant', 'name' => 'Pizza Place' } } + ] + } + ) + ] + end + + it 'returns the name of the most common type' do + expect(suggester.call).to eq('Coffee Shop') + end + end + + context 'when features have a common type but different names' do + let(:points) do + [ + double( + 'Point', + geodata: { + 'features' => [ + { 'properties' => { 'type' => 'park', 'name' => 'Central Park' } } + ] + } + ), + double( + 'Point', + geodata: { + 'features' => [ + { 'properties' => { 'type' => 'park', 'name' => 'City Park' } } + ] + } + ), + double( + 'Point', + geodata: { + 'features' => [ + { 'properties' => { 'type' => 'park', 'name' => 'Central Park' } } + ] + } + ) + ] + end + + it 'returns the most common name' do + expect(suggester.call).to eq('Central Park') + end + end + + context 'when a complete place can be built' do + let(:points) do + [ + double( + 'Point', + geodata: { + 'features' => [ + { + 'properties' => { + 'type' => 'cafe', + 'name' => 'Starbucks', + 'street' => '123 Main St', + 'city' => 'San Francisco', + 'state' => 'CA' + } + } + ] + } + ) + ] + end + + it 'returns a descriptive name with all components' do + expect(suggester.call).to eq('Starbucks, 123 Main St, San Francisco, CA') + end + end + + context 'when only partial place details are available' do + let(:points) do + [ + double( + 'Point', + geodata: { + 'features' => [ + { + 'properties' => { + 'type' => 'cafe', + 'name' => 'Starbucks', + 'city' => 'San Francisco' + # No street or state + } + } + ] + } + ) + ] + end + + it 'returns a name with available components' do + expect(suggester.call).to eq('Starbucks, San Francisco') + end + end + + context 'when points have geodata with non-array features' do + let(:points) do + [ + double('Point', geodata: { 'features' => 'not an array' }) + ] + end + + it 'returns nil' do + expect(suggester.call).to be_nil + end + end + + context 'when most common name is blank' do + let(:points) do + [ + double( + 'Point', + geodata: { + 'features' => [ + { 'properties' => { 'type' => 'road', 'name' => '' } } + ] + } + ) + ] + end + + it 'returns nil' do + expect(suggester.call).to be_nil + end + end + end +end diff --git a/spec/services/visits/place_finder_spec.rb b/spec/services/visits/place_finder_spec.rb index 493ceec5..b924ffae 100644 --- a/spec/services/visits/place_finder_spec.rb +++ b/spec/services/visits/place_finder_spec.rb @@ -75,7 +75,7 @@ RSpec.describe Visits::PlaceFinder do before do allow(Geocoder).to receive(:search).and_return([]) - allow(subject).to receive(:fetch_places_from_api).and_return([]) + allow(subject).to receive(:reverse_geocoded_places).and_return([]) end it 'extracts and creates places from point geodata' do diff --git a/spec/support/geocoder_stubs.rb b/spec/support/geocoder_stubs.rb new file mode 100644 index 00000000..617b263d --- /dev/null +++ b/spec/support/geocoder_stubs.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +# Stub all Geocoder requests in tests +RSpec.configure do |config| + config.before(:each) do + # Create a generic stub for all Geocoder requests + allow(Geocoder).to receive(:search).and_return( + [ + double( + data: { + 'properties' => { + 'countrycode' => 'US', + 'country' => 'United States', + 'state' => 'New York', + 'name' => 'Test Location' + } + } + ) + ] + ) + end +end