From df269847773b59604861a9ba86de060874f5ae61 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 27 Dec 2025 23:03:31 +0100 Subject: [PATCH] Allow sharing digest for 1 week or 1 month --- app/models/stat.rb | 4 ++- app/models/users/digest.rb | 6 +++-- app/services/users/digests/calculate_year.rb | 6 ++--- app/views/shared/_sharing_modal.html.erb | 4 ++- app/views/users/digests/index.html.erb | 5 ++-- app/views/users/digests/public_year.html.erb | 2 +- app/views/users/digests/show.html.erb | 8 +++--- .../digests_mailer/year_end_digest.html.erb | 12 +++++++++ .../digests_mailer/year_end_digest.text.erb | 6 ++--- ...93242_change_digests_distance_to_bigint.rb | 16 ------------ db/schema.rb | 4 +-- spec/factories/users/digests.rb | 26 +++++++++---------- .../users/digests/calculate_year_spec.rb | 8 +++--- 13 files changed, 56 insertions(+), 51 deletions(-) delete mode 100644 db/migrate/20251227193242_change_digests_distance_to_bigint.rb diff --git a/app/models/stat.rb b/app/models/stat.rb index 1bcb2cbf..4b0e6394 100644 --- a/app/models/stat.rb +++ b/app/models/stat.rb @@ -68,12 +68,14 @@ class Stat < ApplicationRecord def enable_sharing!(expiration: '1h') # Default to 24h if an invalid expiration is provided - expiration = '24h' unless %w[1h 12h 24h].include?(expiration) + expiration = '24h' unless %w[1h 12h 24h 1w 1m].include?(expiration) expires_at = case expiration when '1h' then 1.hour.from_now when '12h' then 12.hours.from_now when '24h' then 24.hours.from_now + when '1w' then 1.week.from_now + when '1m' then 1.month.from_now end update!( diff --git a/app/models/users/digest.rb b/app/models/users/digest.rb index 0c65a753..843aa115 100644 --- a/app/models/users/digest.rb +++ b/app/models/users/digest.rb @@ -46,12 +46,14 @@ class Users::Digest < ApplicationRecord end def enable_sharing!(expiration: '24h') - expiration = '24h' unless %w[1h 12h 24h].include?(expiration) + expiration = '24h' unless %w[1h 12h 24h 1w 1m].include?(expiration) expires_at = case expiration when '1h' then 1.hour.from_now when '12h' then 12.hours.from_now when '24h' then 24.hours.from_now + when '1w' then 1.week.from_now + when '1m' then 1.month.from_now end update!( @@ -127,7 +129,7 @@ class Users::Digest < ApplicationRecord end def total_distance_all_time - all_time_stats['total_distance'] || 0 + (all_time_stats['total_distance'] || 0).to_i end def distance_km diff --git a/app/services/users/digests/calculate_year.rb b/app/services/users/digests/calculate_year.rb index f278c6a6..faea7d50 100644 --- a/app/services/users/digests/calculate_year.rb +++ b/app/services/users/digests/calculate_year.rb @@ -76,12 +76,12 @@ module Users result = {} monthly_stats.each do |stat| - result[stat.month.to_s] = stat.distance + result[stat.month.to_s] = stat.distance.to_s end # Fill in missing months with 0 (1..12).each do |month| - result[month.to_s] ||= 0 + result[month.to_s] ||= '0' end result @@ -131,7 +131,7 @@ module Users { 'total_countries' => user.countries_visited.count, 'total_cities' => user.cities_visited.count, - 'total_distance' => user.stats.sum(:distance) + 'total_distance' => user.stats.sum(:distance).to_s } end end diff --git a/app/views/shared/_sharing_modal.html.erb b/app/views/shared/_sharing_modal.html.erb index 926719cb..f994558b 100644 --- a/app/views/shared/_sharing_modal.html.erb +++ b/app/views/shared/_sharing_modal.html.erb @@ -43,7 +43,9 @@ <%= options_for_select([ ['1 hour', '1h'], ['12 hours', '12h'], - ['24 hours', '24h'] + ['24 hours', '24h'], + ['1 week', '1w'], + ['1 month', '1m'] ], @stat&.sharing_settings&.dig('expiration') || '1h') %> diff --git a/app/views/users/digests/index.html.erb b/app/views/users/digests/index.html.erb index 142f4eab..7b695d23 100644 --- a/app/views/users/digests/index.html.erb +++ b/app/views/users/digests/index.html.erb @@ -27,8 +27,9 @@ <% if @digests.empty? %>
-
<%= icon 'earth' %>
-

No Year-End Digests Yet

+

+ <%= icon 'earth' %>No Year-End Digests Yet +

Year-end digests are automatically generated on January 1st each year. <% if @available_years.any? && current_user.active? %> diff --git a/app/views/users/digests/public_year.html.erb b/app/views/users/digests/public_year.html.erb index 2031aef2..a2cfaec7 100644 --- a/app/views/users/digests/public_year.html.erb +++ b/app/views/users/digests/public_year.html.erb @@ -80,7 +80,7 @@

<%= column_chart( @digest.monthly_distances.sort.map { |month, distance_meters| - [Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters, @distance_unit).round] + [Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters.to_i, @distance_unit).round] }, height: '200px', suffix: " #{@distance_unit}", diff --git a/app/views/users/digests/show.html.erb b/app/views/users/digests/show.html.erb index 509efb1c..3b69657b 100644 --- a/app/views/users/digests/show.html.erb +++ b/app/views/users/digests/show.html.erb @@ -102,7 +102,7 @@
<%= column_chart( @digest.monthly_distances.sort.map { |month, distance_meters| - [Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters, @distance_unit).round] + [Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters.to_i, @distance_unit).round] }, height: '250px', suffix: " #{@distance_unit}", @@ -262,8 +262,10 @@ <%= options_for_select([ ['1 hour', '1h'], ['12 hours', '12h'], - ['24 hours', '24h'] - ], @digest&.sharing_settings&.dig('expiration') || '1h') %> + ['24 hours', '24h'], + ['1 week', '1w'], + ['1 month', '1m'] + ], @digest&.sharing_settings&.dig('expiration') || '24h') %>
diff --git a/app/views/users/digests_mailer/year_end_digest.html.erb b/app/views/users/digests_mailer/year_end_digest.html.erb index 04163726..65959397 100644 --- a/app/views/users/digests_mailer/year_end_digest.html.erb +++ b/app/views/users/digests_mailer/year_end_digest.html.erb @@ -166,6 +166,12 @@

Your journey, by the numbers

+
+

+ Hi, this is Evgenii from Dawarich! Pretty wild journey last yeah, huh? Let's take a look back at all the places you explored in <%= @digest.year %>. +

+
+
@@ -276,6 +282,12 @@
+
+

+ You can open your digest for sharing on its page on Dawarich: <%= users_digest_url(year: @digest.year) %> +

+
+

Powered by Dawarich, your personal location history.

diff --git a/app/views/users/digests_mailer/year_end_digest.text.erb b/app/views/users/digests_mailer/year_end_digest.text.erb index b5a4e05a..cdb6b6af 100644 --- a/app/views/users/digests_mailer/year_end_digest.text.erb +++ b/app/views/users/digests_mailer/year_end_digest.text.erb @@ -1,9 +1,7 @@ <%= @digest.year %> Year in Review ==================================== -Hi <%= @user.email %>, - -Here's your year in review! +Hi, this is Evgenii from Dawarich! Pretty wild journey last year, huh? Let's take a look back at all the places you explored in <%= @digest.year %>. DISTANCE TRAVELED <%= distance_with_unit(@digest.distance, @distance_unit) %> @@ -34,6 +32,8 @@ ALL-TIME STATS - <%= @digest.total_cities_all_time %> cities explored - <%= distance_with_unit(@digest.total_distance_all_time, @distance_unit) %> traveled +Keep exploring, keep discovering. Here's to even more adventures in <%= @digest.year + 1 %>! + -- Powered by Dawarich https://dawarich.app diff --git a/db/migrate/20251227193242_change_digests_distance_to_bigint.rb b/db/migrate/20251227193242_change_digests_distance_to_bigint.rb deleted file mode 100644 index 24115035..00000000 --- a/db/migrate/20251227193242_change_digests_distance_to_bigint.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -class ChangeDigestsDistanceToBigint < ActiveRecord::Migration[8.0] - # Safe: digests table is new with minimal data - disable_ddl_transaction! - - def change - if respond_to?(:safety_assured) - safety_assured do - change_column :digests, :distance, :bigint, null: false, default: 0 - end - else - change_column :digests, :distance, :bigint, null: false, default: 0 - end - end -end diff --git a/db/schema.rb b/db/schema.rb index f1874bc4..c6779875 100644 --- a/db/schema.rb +++ b/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_193242) do +ActiveRecord::Schema[8.0].define(version: 2025_12_27_000001) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" enable_extension "postgis" @@ -84,7 +84,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_27_193242) do t.bigint "user_id", null: false t.integer "year", null: false t.integer "period_type", default: 0, null: false - t.bigint "distance", default: 0, null: false + t.integer "distance", default: 0, null: false t.jsonb "toponyms", default: {} t.jsonb "monthly_distances", default: {} t.jsonb "time_spent_by_location", default: {} diff --git a/spec/factories/users/digests.rb b/spec/factories/users/digests.rb index 13a2a21e..8d0182ab 100644 --- a/spec/factories/users/digests.rb +++ b/spec/factories/users/digests.rb @@ -28,18 +28,18 @@ FactoryBot.define do monthly_distances do { - '1' => 50_000, - '2' => 45_000, - '3' => 60_000, - '4' => 55_000, - '5' => 40_000, - '6' => 35_000, - '7' => 30_000, - '8' => 45_000, - '9' => 50_000, - '10' => 40_000, - '11' => 25_000, - '12' => 25_000 + '1' => '50000', + '2' => '45000', + '3' => '60000', + '4' => '55000', + '5' => '40000', + '6' => '35000', + '7' => '30000', + '8' => '45000', + '9' => '50000', + '10' => '40000', + '11' => '25000', + '12' => '25000' } end @@ -78,7 +78,7 @@ FactoryBot.define do { 'total_countries' => 10, 'total_cities' => 45, - 'total_distance' => 2_500_000 + 'total_distance' => '2500000' } end diff --git a/spec/services/users/digests/calculate_year_spec.rb b/spec/services/users/digests/calculate_year_spec.rb index d6bdf912..fe01120f 100644 --- a/spec/services/users/digests/calculate_year_spec.rb +++ b/spec/services/users/digests/calculate_year_spec.rb @@ -71,9 +71,9 @@ RSpec.describe Users::Digests::CalculateYear do end it 'builds monthly distances' do - expect(calculate_digest.monthly_distances['1']).to eq(50_000) - expect(calculate_digest.monthly_distances['2']).to eq(75_000) - expect(calculate_digest.monthly_distances['3']).to eq(0) # Missing month + 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' do @@ -86,7 +86,7 @@ RSpec.describe Users::Digests::CalculateYear do end it 'calculates all time stats' do - expect(calculate_digest.all_time_stats['total_distance']).to eq(125_000) + expect(calculate_digest.all_time_stats['total_distance']).to eq('125000') end context 'when digest already exists' do