mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-09 08:47:11 -05:00
* fix: move foreman to global gems to fix startup crash (#1971) * Update exporting code to stream points data to file in batches to red… (#1980) * Update exporting code to stream points data to file in batches to reduce memory usage * Update changelog * Update changelog * Feature/maplibre frontend (#1953) * Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet * Implement phase 1 * Phases 1-3 + part of 4 * Fix e2e tests * Phase 6 * Implement fog of war * Phase 7 * Next step: fix specs, phase 7 done * Use our own map tiles * Extract v2 map logic to separate manager classes * Update settings panel on v2 map * Update v2 e2e tests structure * Reimplement location search in maps v2 * Update speed routes * Implement visits and places creation in v2 * Fix last failing test * Implement visits merging * Fix a routes e2e test and simplify the routes layer styling. * Extract js to modules from maps_v2_controller.js * Implement area creation * Fix spec problem * Fix some e2e tests * Implement live mode in v2 map * Update icons and panel * Extract some styles * Remove unused file * Start adding dark theme to popups on MapLibre maps * Make popups respect dark theme * Move v2 maps to maplibre namespace * Update v2 references to maplibre * Put place, area and visit info into side panel * Update API to use safe settings config method * Fix specs * Fix method name to config in SafeSettings and update usages accordingly * Add missing public files * Add handling for real time points * Fix remembering enabled/disabled layers of the v2 map * Fix lots of e2e tests * Add settings to select map version * Use maps/v2 as main path for MapLibre maps * Update routing * Update live mode * Update maplibre controller * Update changelog * Remove some console.log statements * Pull only necessary data for map v2 points * Feature/raw data archive (#2009) * 0.36.2 (#2007) * fix: move foreman to global gems to fix startup crash (#1971) * Update exporting code to stream points data to file in batches to red… (#1980) * Update exporting code to stream points data to file in batches to reduce memory usage * Update changelog * Update changelog * Feature/maplibre frontend (#1953) * Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet * Implement phase 1 * Phases 1-3 + part of 4 * Fix e2e tests * Phase 6 * Implement fog of war * Phase 7 * Next step: fix specs, phase 7 done * Use our own map tiles * Extract v2 map logic to separate manager classes * Update settings panel on v2 map * Update v2 e2e tests structure * Reimplement location search in maps v2 * Update speed routes * Implement visits and places creation in v2 * Fix last failing test * Implement visits merging * Fix a routes e2e test and simplify the routes layer styling. * Extract js to modules from maps_v2_controller.js * Implement area creation * Fix spec problem * Fix some e2e tests * Implement live mode in v2 map * Update icons and panel * Extract some styles * Remove unused file * Start adding dark theme to popups on MapLibre maps * Make popups respect dark theme * Move v2 maps to maplibre namespace * Update v2 references to maplibre * Put place, area and visit info into side panel * Update API to use safe settings config method * Fix specs * Fix method name to config in SafeSettings and update usages accordingly * Add missing public files * Add handling for real time points * Fix remembering enabled/disabled layers of the v2 map * Fix lots of e2e tests * Add settings to select map version * Use maps/v2 as main path for MapLibre maps * Update routing * Update live mode * Update maplibre controller * Update changelog * Remove some console.log statements --------- Co-authored-by: Robin Tuszik <mail@robin.gg> * Remove esbuild scripts from package.json * Remove sideEffects field from package.json * Raw data archivation * Add tests * Fix tests * Fix tests * Update ExceptionReporter * Add schedule to run raw data archival job monthly * Change file structure for raw data archival feature * Update changelog and version for raw data archival feature --------- Co-authored-by: Robin Tuszik <mail@robin.gg> * Set raw_data to an empty hash instead of nil when archiving * Fix storage configuration and file extraction * Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation (#2018) * Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation * Remove raw data from visited cities api endpoint * Use user timezone to show dates on maps (#2020) * Fix/pre epoch time (#2019) * Use user timezone to show dates on maps * Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates. * Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates. * Fix tests failing due to new index on stats table * Fix failing specs * Update redis client configuration to support unix socket connection * Update changelog * Fix kml kmz import issues (#2023) * Fix kml kmz import issues * Refactor KML importer to improve readability and maintainability * Implement moving points in map v2 and fix route rendering logic to ma… (#2027) * Implement moving points in map v2 and fix route rendering logic to match map v1. * Fix route spec * fix(maplibre): update date format to ISO 8601 (#2029) * Add verification step to raw data archival process (#2028) * Add verification step to raw data archival process * Add actual verification of raw data archives after creation, and only clear raw_data for verified archives. * Fix failing specs * Eliminate zip-bomb risk * Fix potential memory leak in js * Return .keep files * Use Toast instead of alert for notifications * Add help section to navbar dropdown * Update changelog * Remove raw_data_archival_job * Ensure file is being closed properly after reading in Archivable concern * Add composite index to stats table if not exists * Update changelog * Update entrypoint to always sync static assets (not only new ones) * Add family layer to MapLibre maps (#2055) * Add family layer to MapLibre maps * Update migration * Don't show family toggle if feature is disabled * Update changelog * Return changelog * Update changelog * Update tailwind file * Bump sentry-rails from 6.0.0 to 6.1.0 (#1945) Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/getsentry/sentry-ruby/releases) - [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-ruby/compare/6.0.0...6.1.0) --- updated-dependencies: - dependency-name: sentry-rails dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump turbo-rails from 2.0.17 to 2.0.20 (#1944) Bumps [turbo-rails](https://github.com/hotwired/turbo-rails) from 2.0.17 to 2.0.20. - [Release notes](https://github.com/hotwired/turbo-rails/releases) - [Commits](https://github.com/hotwired/turbo-rails/compare/v2.0.17...v2.0.20) --- updated-dependencies: - dependency-name: turbo-rails dependency-version: 2.0.20 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> * Bump webmock from 3.25.1 to 3.26.1 (#1943) Bumps [webmock](https://github.com/bblimke/webmock) from 3.25.1 to 3.26.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.25.1...v3.26.1) --- updated-dependencies: - dependency-name: webmock dependency-version: 3.26.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> * Bump brakeman from 7.1.0 to 7.1.1 (#1942) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v7.1.0...v7.1.1) --- updated-dependencies: - dependency-name: brakeman dependency-version: 7.1.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump redis from 5.4.0 to 5.4.1 (#1941) Bumps [redis](https://github.com/redis/redis-rb) from 5.4.0 to 5.4.1. - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v5.4.0...v5.4.1) --- updated-dependencies: - dependency-name: redis dependency-version: 5.4.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Put import deletion into background job (#2045) * Put import deletion into background job * Update changelog * fix null type error and update heatmap styling (#2037) * fix: use constant weight for maplibre heatmap layer * fix null type, update heatmap styling * improve heatmap styling * fix typo * Fix stats calculation to recursively reduce H3 resolution when too ma… (#2065) * Fix stats calculation to recursively reduce H3 resolution when too many hexagons are generated * Update CHANGELOG.md * Validate trip start and end dates (#2066) * Validate trip start and end dates * Update changelog * Update migration to clean up duplicate stats before adding unique index * Fix fog of war radius setting being ignored and applying settings causing errors (#2068) * Update changelog * Add Rack::Deflater middleware to config/application.rb to enable gzip compression for responses. * Add composite index to points on user_id and timestamp * Deduplicte points based on timestamp brought to unix time * Fix/stats cache invalidation (#2072) * Fix family layer toggle in Map v2 settings for non-selfhosted env * Invalidate cache * Remove comments * Remove comment * Add new indicies to improve performance and remove unused ones to opt… (#2078) * Add new indicies to improve performance and remove unused ones to optimize database. * Remove comments * Update map search suggestions panel styling * Add yearly digest (#2073) * Add yearly digest * Rename YearlyDigests to Users::Digests * Minor changes * Update yearly digest layout and styles * Add flags and chart to email * Update colors * Fix layout of stats in yearly digest view * Remove cron job for yearly digest scheduling * Update CHANGELOG.md * Update digest email setting handling * Allow sharing digest for 1 week or 1 month * Change Digests Distance to Bigint * Fix settings page * Update changelog * Add RailsPulse (#2079) * Add RailsPulse * Add RailsPulse monitoring tool with basic HTTP authentication * Bring points_count to integer * Update migration and version * Update rubocop issues * Fix migrations and data verification to remove safety_assured blocks and handle missing points gracefully. * Update version * Update calculation of time spent in a country for year-end digest email (#2110) * Update calculation of time spent in a country for year-end digest email * Add a filter to exclude raw data points when calculating yearly digests. * Bump trix from 2.1.15 to 2.1.16 in the npm_and_yarn group across 1 directory (#2098) * 0.37.1 (#2092) * fix: move foreman to global gems to fix startup crash (#1971) * Update exporting code to stream points data to file in batches to red… (#1980) * Update exporting code to stream points data to file in batches to reduce memory usage * Update changelog * Update changelog * Feature/maplibre frontend (#1953) * Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet * Implement phase 1 * Phases 1-3 + part of 4 * Fix e2e tests * Phase 6 * Implement fog of war * Phase 7 * Next step: fix specs, phase 7 done * Use our own map tiles * Extract v2 map logic to separate manager classes * Update settings panel on v2 map * Update v2 e2e tests structure * Reimplement location search in maps v2 * Update speed routes * Implement visits and places creation in v2 * Fix last failing test * Implement visits merging * Fix a routes e2e test and simplify the routes layer styling. * Extract js to modules from maps_v2_controller.js * Implement area creation * Fix spec problem * Fix some e2e tests * Implement live mode in v2 map * Update icons and panel * Extract some styles * Remove unused file * Start adding dark theme to popups on MapLibre maps * Make popups respect dark theme * Move v2 maps to maplibre namespace * Update v2 references to maplibre * Put place, area and visit info into side panel * Update API to use safe settings config method * Fix specs * Fix method name to config in SafeSettings and update usages accordingly * Add missing public files * Add handling for real time points * Fix remembering enabled/disabled layers of the v2 map * Fix lots of e2e tests * Add settings to select map version * Use maps/v2 as main path for MapLibre maps * Update routing * Update live mode * Update maplibre controller * Update changelog * Remove some console.log statements * Pull only necessary data for map v2 points * Feature/raw data archive (#2009) * 0.36.2 (#2007) * fix: move foreman to global gems to fix startup crash (#1971) * Update exporting code to stream points data to file in batches to red… (#1980) * Update exporting code to stream points data to file in batches to reduce memory usage * Update changelog * Update changelog * Feature/maplibre frontend (#1953) * Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet * Implement phase 1 * Phases 1-3 + part of 4 * Fix e2e tests * Phase 6 * Implement fog of war * Phase 7 * Next step: fix specs, phase 7 done * Use our own map tiles * Extract v2 map logic to separate manager classes * Update settings panel on v2 map * Update v2 e2e tests structure * Reimplement location search in maps v2 * Update speed routes * Implement visits and places creation in v2 * Fix last failing test * Implement visits merging * Fix a routes e2e test and simplify the routes layer styling. * Extract js to modules from maps_v2_controller.js * Implement area creation * Fix spec problem * Fix some e2e tests * Implement live mode in v2 map * Update icons and panel * Extract some styles * Remove unused file * Start adding dark theme to popups on MapLibre maps * Make popups respect dark theme * Move v2 maps to maplibre namespace * Update v2 references to maplibre * Put place, area and visit info into side panel * Update API to use safe settings config method * Fix specs * Fix method name to config in SafeSettings and update usages accordingly * Add missing public files * Add handling for real time points * Fix remembering enabled/disabled layers of the v2 map * Fix lots of e2e tests * Add settings to select map version * Use maps/v2 as main path for MapLibre maps * Update routing * Update live mode * Update maplibre controller * Update changelog * Remove some console.log statements --------- Co-authored-by: Robin Tuszik <mail@robin.gg> * Remove esbuild scripts from package.json * Remove sideEffects field from package.json * Raw data archivation * Add tests * Fix tests * Fix tests * Update ExceptionReporter * Add schedule to run raw data archival job monthly * Change file structure for raw data archival feature * Update changelog and version for raw data archival feature --------- Co-authored-by: Robin Tuszik <mail@robin.gg> * Set raw_data to an empty hash instead of nil when archiving * Fix storage configuration and file extraction * Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation (#2018) * Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation * Remove raw data from visited cities api endpoint * Use user timezone to show dates on maps (#2020) * Fix/pre epoch time (#2019) * Use user timezone to show dates on maps * Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates. * Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates. * Fix tests failing due to new index on stats table * Fix failing specs * Update redis client configuration to support unix socket connection * Update changelog * Fix kml kmz import issues (#2023) * Fix kml kmz import issues * Refactor KML importer to improve readability and maintainability * Implement moving points in map v2 and fix route rendering logic to ma… (#2027) * Implement moving points in map v2 and fix route rendering logic to match map v1. * Fix route spec * fix(maplibre): update date format to ISO 8601 (#2029) * Add verification step to raw data archival process (#2028) * Add verification step to raw data archival process * Add actual verification of raw data archives after creation, and only clear raw_data for verified archives. * Fix failing specs * Eliminate zip-bomb risk * Fix potential memory leak in js * Return .keep files * Use Toast instead of alert for notifications * Add help section to navbar dropdown * Update changelog * Remove raw_data_archival_job * Ensure file is being closed properly after reading in Archivable concern * Add composite index to stats table if not exists * Update changelog * Update entrypoint to always sync static assets (not only new ones) * Add family layer to MapLibre maps (#2055) * Add family layer to MapLibre maps * Update migration * Don't show family toggle if feature is disabled * Update changelog * Return changelog * Update changelog * Update tailwind file * Bump sentry-rails from 6.0.0 to 6.1.0 (#1945) Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/getsentry/sentry-ruby/releases) - [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-ruby/compare/6.0.0...6.1.0) --- updated-dependencies: - dependency-name: sentry-rails dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump turbo-rails from 2.0.17 to 2.0.20 (#1944) Bumps [turbo-rails](https://github.com/hotwired/turbo-rails) from 2.0.17 to 2.0.20. - [Release notes](https://github.com/hotwired/turbo-rails/releases) - [Commits](https://github.com/hotwired/turbo-rails/compare/v2.0.17...v2.0.20) --- updated-dependencies: - dependency-name: turbo-rails dependency-version: 2.0.20 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> * Bump webmock from 3.25.1 to 3.26.1 (#1943) Bumps [webmock](https://github.com/bblimke/webmock) from 3.25.1 to 3.26.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.25.1...v3.26.1) --- updated-dependencies: - dependency-name: webmock dependency-version: 3.26.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> * Bump brakeman from 7.1.0 to 7.1.1 (#1942) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v7.1.0...v7.1.1) --- updated-dependencies: - dependency-name: brakeman dependency-version: 7.1.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump redis from 5.4.0 to 5.4.1 (#1941) Bumps [redis](https://github.com/redis/redis-rb) from 5.4.0 to 5.4.1. - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v5.4.0...v5.4.1) --- updated-dependencies: - dependency-name: redis dependency-version: 5.4.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Put import deletion into background job (#2045) * Put import deletion into background job * Update changelog * fix null type error and update heatmap styling (#2037) * fix: use constant weight for maplibre heatmap layer * fix null type, update heatmap styling * improve heatmap styling * fix typo * Fix stats calculation to recursively reduce H3 resolution when too ma… (#2065) * Fix stats calculation to recursively reduce H3 resolution when too many hexagons are generated * Update CHANGELOG.md * Validate trip start and end dates (#2066) * Validate trip start and end dates * Update changelog * Update migration to clean up duplicate stats before adding unique index * Fix fog of war radius setting being ignored and applying settings causing errors (#2068) * Update changelog * Add Rack::Deflater middleware to config/application.rb to enable gzip compression for responses. * Add composite index to points on user_id and timestamp * Deduplicte points based on timestamp brought to unix time * Fix/stats cache invalidation (#2072) * Fix family layer toggle in Map v2 settings for non-selfhosted env * Invalidate cache * Remove comments * Remove comment * Add new indicies to improve performance and remove unused ones to opt… (#2078) * Add new indicies to improve performance and remove unused ones to optimize database. * Remove comments * Update map search suggestions panel styling * Add yearly digest (#2073) * Add yearly digest * Rename YearlyDigests to Users::Digests * Minor changes * Update yearly digest layout and styles * Add flags and chart to email * Update colors * Fix layout of stats in yearly digest view * Remove cron job for yearly digest scheduling * Update CHANGELOG.md * Update digest email setting handling * Allow sharing digest for 1 week or 1 month * Change Digests Distance to Bigint * Fix settings page * Update changelog * Add RailsPulse (#2079) * Add RailsPulse * Add RailsPulse monitoring tool with basic HTTP authentication * Bring points_count to integer * Update migration and version * Update rubocop issues * Fix migrations and data verification to remove safety_assured blocks and handle missing points gracefully. * Update version --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Robin Tuszik <mail@robin.gg> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump trix in the npm_and_yarn group across 1 directory Bumps the npm_and_yarn group with 1 update in the / directory: [trix](https://github.com/basecamp/trix). Updates `trix` from 2.1.15 to 2.1.16 - [Release notes](https://github.com/basecamp/trix/releases) - [Commits](https://github.com/basecamp/trix/compare/v2.1.15...v2.1.16) --- updated-dependencies: - dependency-name: trix dependency-version: 2.1.16 dependency-type: direct:production dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> Co-authored-by: Robin Tuszik <mail@robin.gg> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Map v2 will no longer block the UI when Immich/Photoprism integration has a bad URL or is unreachable (#2113) * Bump rubocop-rails from 2.33.4 to 2.34.2 (#2080) Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.33.4 to 2.34.2. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.33.4...v2.34.2) --- updated-dependencies: - dependency-name: rubocop-rails dependency-version: 2.34.2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump chartkick from 5.2.0 to 5.2.1 (#2081) Bumps [chartkick](https://github.com/ankane/chartkick) from 5.2.0 to 5.2.1. - [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/chartkick/compare/v5.2.0...v5.2.1) --- updated-dependencies: - dependency-name: chartkick dependency-version: 5.2.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rubyzip from 3.2.0 to 3.2.2 (#2082) Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 3.2.0 to 3.2.2. - [Release notes](https://github.com/rubyzip/rubyzip/releases) - [Changelog](https://github.com/rubyzip/rubyzip/blob/main/Changelog.md) - [Commits](https://github.com/rubyzip/rubyzip/compare/v3.2.0...v3.2.2) --- updated-dependencies: - dependency-name: rubyzip dependency-version: 3.2.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sentry-ruby from 6.0.0 to 6.2.0 (#2083) Bumps [sentry-ruby](https://github.com/getsentry/sentry-ruby) from 6.0.0 to 6.2.0. - [Release notes](https://github.com/getsentry/sentry-ruby/releases) - [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-ruby/compare/6.0.0...6.2.0) --- updated-dependencies: - dependency-name: sentry-ruby dependency-version: 6.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> * Bump sidekiq from 8.0.8 to 8.1.0 (#2084) Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 8.0.8 to 8.1.0. - [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) - [Commits](https://github.com/sidekiq/sidekiq/compare/v8.0.8...v8.1.0) --- updated-dependencies: - dependency-name: sidekiq dependency-version: 8.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> * Update digest calculation to use actual time spent in countries based… (#2115) * 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 * Update Gemfile and Gemfile.lock to pin connection_pool and sidekiq versions * Rework country tracked days calculation * Adjust calculate_duration_in_minutes to only count continuous presence within cities, excluding long gaps. * Move helpers for digest city progress to a helper method * Implement globe projection option for Map v2 using MapLibre GL JS. * Update time spent calculation for country minutes in user digests * Stats are now calculated with more accuracy by storing total minutes spent per country. * Add globe_projection setting to safe settings --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Robin Tuszik <mail@robin.gg> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
291 lines
12 KiB
Ruby
291 lines
12 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
RSpec.describe Users::Digests::CalculateYear do
|
|
describe '#call' do
|
|
subject(:calculate_digest) { described_class.new(user.id, year).call }
|
|
|
|
let(:user) { create(:user) }
|
|
let(:year) { 2024 }
|
|
|
|
context 'when user has no stats for the year' do
|
|
it 'returns nil' do
|
|
expect(calculate_digest).to be_nil
|
|
end
|
|
|
|
it 'does not create a digest' do
|
|
expect { calculate_digest }.not_to(change { Users::Digest.count })
|
|
end
|
|
end
|
|
|
|
context 'when user has stats for the year' do
|
|
let!(:january_stat) do
|
|
create(:stat, user: user, year: 2024, month: 1, distance: 50_000, toponyms: [
|
|
{ 'country' => 'Germany', 'cities' => [
|
|
{ 'city' => 'Berlin', 'stayed_for' => 480 },
|
|
{ 'city' => 'Munich', 'stayed_for' => 240 }
|
|
] }
|
|
])
|
|
end
|
|
|
|
let!(:february_stat) do
|
|
create(:stat, user: user, year: 2024, month: 2, distance: 75_000, toponyms: [
|
|
{ 'country' => 'France', 'cities' => [
|
|
{ 'city' => 'Paris', 'stayed_for' => 360 }
|
|
] }
|
|
])
|
|
end
|
|
|
|
it 'creates a yearly digest' do
|
|
expect { calculate_digest }.to change { Users::Digest.count }.by(1)
|
|
end
|
|
|
|
it 'returns the created digest' do
|
|
expect(calculate_digest).to be_a(Users::Digest)
|
|
end
|
|
|
|
it 'sets the correct year' do
|
|
expect(calculate_digest.year).to eq(2024)
|
|
end
|
|
|
|
it 'sets the period type to yearly' do
|
|
expect(calculate_digest.period_type).to eq('yearly')
|
|
end
|
|
|
|
it 'calculates total distance' do
|
|
expect(calculate_digest.distance).to eq(125_000)
|
|
end
|
|
|
|
it 'aggregates countries with their cities' do
|
|
toponyms = calculate_digest.toponyms
|
|
|
|
countries = toponyms.map { |t| t['country'] }
|
|
expect(countries).to contain_exactly('France', 'Germany')
|
|
|
|
germany = toponyms.find { |t| t['country'] == 'Germany' }
|
|
expect(germany['cities'].map { |c| c['city'] }).to contain_exactly('Berlin', 'Munich')
|
|
|
|
france = toponyms.find { |t| t['country'] == 'France' }
|
|
expect(france['cities'].map { |c| c['city'] }).to contain_exactly('Paris')
|
|
end
|
|
|
|
it 'builds monthly distances' do
|
|
expect(calculate_digest.monthly_distances['1']).to eq('50000')
|
|
expect(calculate_digest.monthly_distances['2']).to eq('75000')
|
|
expect(calculate_digest.monthly_distances['3']).to eq('0') # Missing month
|
|
end
|
|
|
|
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']
|
|
|
|
# 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)
|
|
end
|
|
|
|
it 'updates the existing digest' do
|
|
expect { calculate_digest }.not_to(change { Users::Digest.count })
|
|
end
|
|
|
|
it 'updates the distance' do
|
|
calculate_digest
|
|
expect(existing_digest.reload.distance).to eq(125_000)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with previous year data for comparison' do
|
|
let!(:previous_year_stat) do
|
|
create(:stat, user: user, year: 2023, month: 1, distance: 100_000, toponyms: [
|
|
{ 'country' => 'Germany', 'cities' => [{ 'city' => 'Berlin' }] }
|
|
])
|
|
end
|
|
|
|
let!(:current_year_stat) do
|
|
create(:stat, user: user, year: 2024, month: 1, distance: 150_000, toponyms: [
|
|
{ 'country' => 'Germany', 'cities' => [{ 'city' => 'Berlin' }] },
|
|
{ 'country' => 'France', 'cities' => [{ 'city' => 'Paris' }] }
|
|
])
|
|
end
|
|
|
|
it 'calculates year over year comparison' do
|
|
expect(calculate_digest.year_over_year['previous_year']).to eq(2023)
|
|
expect(calculate_digest.year_over_year['distance_change_percent']).to eq(50)
|
|
end
|
|
|
|
it 'identifies first time visits' do
|
|
expect(calculate_digest.first_time_visits['countries']).to eq(['France'])
|
|
expect(calculate_digest.first_time_visits['cities']).to eq(['Paris'])
|
|
end
|
|
end
|
|
|
|
context 'when user not found' do
|
|
it 'raises ActiveRecord::RecordNotFound' do
|
|
expect do
|
|
described_class.new(999_999, year).call
|
|
end.to raise_error(ActiveRecord::RecordNotFound)
|
|
end
|
|
end
|
|
end
|
|
end
|