The personal finance app for everyone
Implement auto family syncs on login (#1021)
Zach Gollwitzeref4be7948ac0
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rbindex 84f8a8fe..b8d5a836 100644--- a/app/controllers/application_controller.rb+++ b/app/controllers/application_controller.rb@@ -1,5 +1,5 @@class ApplicationController < ActionController::Base- include Authentication, Invitable, SelfHostable+ include AutoSync, Authentication, Invitable, SelfHostableinclude Pagy::Backend# Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.diff --git a/app/controllers/concerns/auto_sync.rb b/app/controllers/concerns/auto_sync.rbnew file mode 100644index 00000000..122710a6--- /dev/null+++ b/app/controllers/concerns/auto_sync.rb@@ -0,0 +1,13 @@+module AutoSync+ extend ActiveSupport::Concern++ included do+ before_action :sync_family, if: -> { Current.family.present? && Current.family.needs_sync? }+ end++ private++ def sync_family+ Current.family.sync+ end+enddiff --git a/app/models/account/sync.rb b/app/models/account/sync.rbindex 5db21b89..1442ec0b 100644--- a/app/models/account/sync.rb+++ b/app/models/account/sync.rb@@ -78,5 +78,6 @@ class Account::Sync < ApplicationRecordpartial: "shared/notification",locals: { type: type, message: message })+ broadcast_refresh_to accountendenddiff --git a/app/models/account/syncable.rb b/app/models/account/syncable.rbindex a0fe78cd..382d401f 100644--- a/app/models/account/syncable.rb+++ b/app/models/account/syncable.rb@@ -11,6 +11,14 @@ module Account::Syncablesyncs.syncing.any?end+ def latest_sync_date+ syncs.where.not(last_ran_at: nil).pluck(:last_ran_at).max&.to_date+ end++ def needs_sync?+ latest_sync_date.nil? || latest_sync_date < Date.current+ end+def sync_later(start_date: nil)AccountSyncJob.perform_later(self, start_date: start_date)enddiff --git a/app/models/demo/generator.rb b/app/models/demo/generator.rbindex b897064b..2fb27157 100644--- a/app/models/demo/generator.rb+++ b/app/models/demo/generator.rb@@ -34,10 +34,6 @@ class Demo::Generatorcreate_car_and_loan!puts "accounts created"-- family.sync-- puts "balances synced"puts "Demo data loaded successfully!"endenddiff --git a/app/models/family.rb b/app/models/family.rbindex cdcf2e8b..2aaeaf14 100644--- a/app/models/family.rb+++ b/app/models/family.rb@@ -105,6 +105,16 @@ class Family < ApplicationRecordenddef sync(start_date: nil)- accounts.active.sync(start_date: start_date)+ accounts.active.each do |account|+ if account.needs_sync?+ account.sync_later(start_date: start_date || account.last_sync_date)+ end+ end++ update! last_synced_at: Time.now+ end++ def needs_sync?+ last_synced_at.nil? || last_synced_at.to_date < Date.currentendenddiff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erbindex 2459a7eb..b67c5869 100644--- a/app/views/accounts/show.html.erb+++ b/app/views/accounts/show.html.erb@@ -1,3 +1,5 @@+<%= turbo_stream_from @account %>+<div class="space-y-4"><div class="flex justify-between items-center"><div class="flex items-center gap-3">diff --git a/db/migrate/20240725163339_add_last_synced_at_to_family.rb b/db/migrate/20240725163339_add_last_synced_at_to_family.rbnew file mode 100644index 00000000..a8f4c886--- /dev/null+++ b/db/migrate/20240725163339_add_last_synced_at_to_family.rb@@ -0,0 +1,5 @@+class AddLastSyncedAtToFamily < ActiveRecord::Migration[7.2]+ def change+ add_column :families, :last_synced_at, :datetime+ end+enddiff --git a/db/schema.rb b/db/schema.rbindex 39a0d8b1..96301c2d 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[7.2].define(version: 2024_07_17_113535) do+ActiveRecord::Schema[7.2].define(version: 2024_07_25_163339) do# These are extensions that must be enabled in order to support this databaseenable_extension "pgcrypto"enable_extension "plpgsql"@@ -118,7 +118,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_07_17_113535) dot.boolean "is_active", default: true, null: falset.date "last_sync_date"t.uuid "institution_id"- t.virtual "classification", type: :string, as: "\nCASE\n WHEN ((accountable_type)::text = ANY (ARRAY[('Loan'::character varying)::text, ('CreditCard'::character varying)::text, ('OtherLiability'::character varying)::text])) THEN 'liability'::text\n ELSE 'asset'::text\nEND", stored: true+ t.virtual "classification", type: :string, as: "\nCASE\n WHEN ((accountable_type)::text = ANY ((ARRAY['Loan'::character varying, 'CreditCard'::character varying, 'OtherLiability'::character varying])::text[])) THEN 'liability'::text\n ELSE 'asset'::text\nEND", stored: truet.index ["accountable_type"], name: "index_accounts_on_accountable_type"t.index ["family_id"], name: "index_accounts_on_family_id"t.index ["institution_id"], name: "index_accounts_on_institution_id"@@ -194,6 +194,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_07_17_113535) dot.datetime "created_at", null: falset.datetime "updated_at", null: falset.string "currency", default: "USD"+ t.datetime "last_synced_at"endcreate_table "good_job_batches", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|diff --git a/test/models/account_test.rb b/test/models/account_test.rbindex ddafdc78..bc1fe8ed 100644--- a/test/models/account_test.rb+++ b/test/models/account_test.rb@@ -25,6 +25,10 @@ class AccountTest < ActiveSupport::TestCase@account.sync start_date: start_dateend+ test "needs sync if account has not synced today" do+ assert @account.needs_sync?+ end+test "groups accounts by type" doresult = @family.accounts.by_group(period: Period.all)assets = result[:assets]diff --git a/test/models/family_test.rb b/test/models/family_test.rbindex a992ef99..2a2649d7 100644--- a/test/models/family_test.rb+++ b/test/models/family_test.rb@@ -48,6 +48,14 @@ class FamilyTest < ActiveSupport::TestCaseassert_equal Money.new(50000, @family.currency), @family.net_worthend+ test "needs sync if last family sync was before today" do+ assert @family.needs_sync?++ @family.update! last_synced_at: Time.now++ assert_not @family.needs_sync?+ end+test "syncs active accounts" doaccount = create_account(balance: 1000, accountable: CreditCard.new, is_active: false)@@ -57,7 +65,9 @@ class FamilyTest < ActiveSupport::TestCaseaccount.update! is_active: true- Account.any_instance.expects(:sync_later).with(start_date: nil).once+ Account.any_instance.expects(:needs_sync?).once.returns(true)+ Account.any_instance.expects(:last_sync_date).once.returns(2.days.ago.to_date)+ Account.any_instance.expects(:sync_later).with(start_date: 2.days.ago.to_date).once@family.syncend