mirror of
https://github.com/maybe-finance/maybe.git
synced 2025-08-09 07:25:19 +02:00
Merge branch 'zachgoll/plaid-cash-security-handling' of github.com:maybe-finance/maybe into zachgoll/plaid-cash-security-handling
This commit is contained in:
commit
d72e026aa2
4 changed files with 39 additions and 25 deletions
|
@ -11,55 +11,55 @@ class Period
|
|||
|
||||
PERIODS = {
|
||||
"last_day" => {
|
||||
date_range: [ 1.day.ago.to_date, Date.current ],
|
||||
date_range: -> { [ 1.day.ago.to_date, Date.current ] },
|
||||
label_short: "1D",
|
||||
label: "Last Day",
|
||||
comparison_label: "vs. yesterday"
|
||||
},
|
||||
"current_week" => {
|
||||
date_range: [ Date.current.beginning_of_week, Date.current ],
|
||||
date_range: -> { [ Date.current.beginning_of_week, Date.current ] },
|
||||
label_short: "WTD",
|
||||
label: "Current Week",
|
||||
comparison_label: "vs. start of week"
|
||||
},
|
||||
"last_7_days" => {
|
||||
date_range: [ 7.days.ago.to_date, Date.current ],
|
||||
date_range: -> { [ 7.days.ago.to_date, Date.current ] },
|
||||
label_short: "7D",
|
||||
label: "Last 7 Days",
|
||||
comparison_label: "vs. last week"
|
||||
},
|
||||
"current_month" => {
|
||||
date_range: [ Date.current.beginning_of_month, Date.current ],
|
||||
date_range: -> { [ Date.current.beginning_of_month, Date.current ] },
|
||||
label_short: "MTD",
|
||||
label: "Current Month",
|
||||
comparison_label: "vs. start of month"
|
||||
},
|
||||
"last_30_days" => {
|
||||
date_range: [ 30.days.ago.to_date, Date.current ],
|
||||
date_range: -> { [ 30.days.ago.to_date, Date.current ] },
|
||||
label_short: "30D",
|
||||
label: "Last 30 Days",
|
||||
comparison_label: "vs. last month"
|
||||
},
|
||||
"last_90_days" => {
|
||||
date_range: [ 90.days.ago.to_date, Date.current ],
|
||||
date_range: -> { [ 90.days.ago.to_date, Date.current ] },
|
||||
label_short: "90D",
|
||||
label: "Last 90 Days",
|
||||
comparison_label: "vs. last quarter"
|
||||
},
|
||||
"current_year" => {
|
||||
date_range: [ Date.current.beginning_of_year, Date.current ],
|
||||
date_range: -> { [ Date.current.beginning_of_year, Date.current ] },
|
||||
label_short: "YTD",
|
||||
label: "Current Year",
|
||||
comparison_label: "vs. start of year"
|
||||
},
|
||||
"last_365_days" => {
|
||||
date_range: [ 365.days.ago.to_date, Date.current ],
|
||||
date_range: -> { [ 365.days.ago.to_date, Date.current ] },
|
||||
label_short: "365D",
|
||||
label: "Last 365 Days",
|
||||
comparison_label: "vs. 1 year ago"
|
||||
},
|
||||
"last_5_years" => {
|
||||
date_range: [ 5.years.ago.to_date, Date.current ],
|
||||
date_range: -> { [ 5.years.ago.to_date, Date.current ] },
|
||||
label_short: "5Y",
|
||||
label: "Last 5 Years",
|
||||
comparison_label: "vs. 5 years ago"
|
||||
|
@ -72,7 +72,7 @@ class Period
|
|||
raise InvalidKeyError, "Invalid period key: #{key}"
|
||||
end
|
||||
|
||||
start_date, end_date = PERIODS[key].fetch(:date_range)
|
||||
start_date, end_date = PERIODS[key].fetch(:date_range).call
|
||||
|
||||
new(key: key, start_date: start_date, end_date: end_date)
|
||||
end
|
||||
|
|
|
@ -47,7 +47,7 @@ class PlaidItem < ApplicationRecord
|
|||
|
||||
# Schedule account syncs
|
||||
accounts.each do |account|
|
||||
account.sync_later(start_date: start_date)
|
||||
account.sync_later(start_date: start_date, parent_sync: sync)
|
||||
end
|
||||
|
||||
Rails.logger.info("Plaid data fetched and loaded")
|
||||
|
|
|
@ -22,9 +22,8 @@ class Sync < ApplicationRecord
|
|||
data = syncable.sync_data(self, start_date: start_date)
|
||||
update!(data: data) if data
|
||||
|
||||
complete! unless has_pending_child_syncs?
|
||||
|
||||
unless has_pending_child_syncs?
|
||||
complete!
|
||||
Rails.logger.info("Sync completed, starting post-sync")
|
||||
syncable.post_sync(self)
|
||||
Rails.logger.info("Post-sync completed")
|
||||
|
@ -33,10 +32,7 @@ class Sync < ApplicationRecord
|
|||
fail! error
|
||||
raise error if Rails.env.development?
|
||||
ensure
|
||||
if has_parent?
|
||||
Rails.logger.info("notifying parent sync id=#{parent_id} of completion")
|
||||
notify_parent_of_completion!
|
||||
end
|
||||
notify_parent_of_completion! if has_parent?
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -49,6 +45,10 @@ class Sync < ApplicationRecord
|
|||
|
||||
unless has_pending_child_syncs?
|
||||
complete!
|
||||
|
||||
# If this sync is both a child and a parent, we need to notify the parent of completion
|
||||
notify_parent_of_completion! if has_parent?
|
||||
|
||||
syncable.post_sync(self)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -32,29 +32,43 @@ class SyncTest < ActiveSupport::TestCase
|
|||
assert_equal "test sync error", @sync.error
|
||||
end
|
||||
|
||||
# Order is important here. Parent syncs must implement sync_data so that their own work
|
||||
# is 100% complete *prior* to queueing up child syncs.
|
||||
test "runs sync with child syncs" do
|
||||
family = families(:dylan_family)
|
||||
|
||||
parent = Sync.create!(syncable: family)
|
||||
child1 = Sync.create!(syncable: family.accounts.first, parent: parent)
|
||||
child2 = Sync.create!(syncable: family.accounts.last, parent: parent)
|
||||
child2 = Sync.create!(syncable: family.accounts.second, parent: parent)
|
||||
grandchild = Sync.create!(syncable: family.accounts.last, parent: child2)
|
||||
|
||||
parent.syncable.expects(:sync_data).returns([]).once
|
||||
child1.syncable.expects(:sync_data).returns([]).once
|
||||
child2.syncable.expects(:sync_data).returns([]).once
|
||||
grandchild.syncable.expects(:sync_data).returns([]).once
|
||||
|
||||
parent.perform # no-op
|
||||
|
||||
assert_equal "syncing", parent.status
|
||||
assert_equal "pending", parent.status
|
||||
assert_equal "pending", child1.status
|
||||
assert_equal "pending", child2.status
|
||||
assert_equal "pending", grandchild.status
|
||||
|
||||
parent.perform
|
||||
assert_equal "syncing", parent.reload.status
|
||||
|
||||
child1.perform
|
||||
assert_equal "completed", child1.status
|
||||
assert_equal "syncing", parent.status
|
||||
assert_equal "completed", child1.reload.status
|
||||
assert_equal "syncing", parent.reload.status
|
||||
|
||||
child2.perform
|
||||
assert_equal "completed", child2.status
|
||||
assert_equal "completed", parent.status
|
||||
assert_equal "syncing", child2.reload.status
|
||||
assert_equal "completed", child1.reload.status
|
||||
assert_equal "syncing", parent.reload.status
|
||||
|
||||
# Will complete the parent and grandparent syncs
|
||||
grandchild.perform
|
||||
assert_equal "completed", grandchild.reload.status
|
||||
assert_equal "completed", child1.reload.status
|
||||
assert_equal "completed", child2.reload.status
|
||||
assert_equal "completed", parent.reload.status
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue