mirror of
https://github.com/we-promise/sure.git
synced 2026-04-18 19:44:09 +00:00
feat: Allow account linking for Enable Banking accounts (#428)
* feat: Allow account linking for Enable Banking accounts * fix: Typo in function name * fix: naming issue * fix: Add missing Enable Banking route * feat: Add ability to link Enable Banking when adding a new account * Mispelling * fix: typo in method call * fix: typo in column name * Review suggestions * Linter noise * Small copy changes to avoid mobile UI blowout * Provider generator (#364) * Move provider config to family * Update schema.rb * Add provier generator * Add table creation also * FIX generator namespace * Add support for global providers also * Remove over-engineered stuff * FIX parser * FIX linter * Some generator fixes * Update generator with fixes * Update item_model.rb.tt * Add missing linkable concern * Add missing routes * Update adapter.rb.tt * Update connectable_concern.rb.tt * Update unlinking_concern.rb.tt * Update family_generator.rb * Update family_generator.rb * Delete .claude/settings.local.json Signed-off-by: soky srm <sokysrm@gmail.com> * Move docs under API related folder * Rename Rails generator doc * Light edits to LLM generated doc * Small Lunch Flow config panel regressions. --------- Signed-off-by: soky srm <sokysrm@gmail.com> Co-authored-by: Juan José Mata <juanjo.mata@gmail.com> * Skip generators autoloading (#430) * Include Enable Banking items in Syncer (#434) * feat: Include Enable Banking items in Syncer * feat: include only active Enable Banking accounts * Fix budgets page UI (#427) * fix: Budget UI improvements * feat: Reduce padding for sub-categories * fix: Adjust padding for sub-category arrow * Revert "feat: Reduce padding for sub-categories" This reverts commit7516c5a8e0. * Revert "fix: Adjust padding for sub-category arrow" This reverts commitebc82542cf. * fix: adjust padding for sub-categories * fix: Add padding to uncategorized budget * fix: Remove unnecessary HTML tag * feat: Add translation keys for budgeted/actual * feat(lang): add all brazilian portuguese translations (#416) * feat(lang): add all brazilian portuguese translations * feat: update pt-BR errors on translation * fix: atualizar fix base * feat: add reports translations * feat: finish translation to brazilian portuguese * fix: add to supported locales * fix: number of translations * fix: errors on translations * fix: error on rubocop lint --------- Co-authored-by: Leonardo Ralph <theleoralph@gmail.com> * Add exclude transaction rule action (#437) * Initial plan * Add ExcludeTransaction rule action executor with tests Co-authored-by: jjmata <187772+jjmata@users.noreply.github.com> * Copy clarification --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jjmata <187772+jjmata@users.noreply.github.com> Co-authored-by: Juan José Mata <juanjo.mata@gmail.com> * Preparing for v0.6.6-alpha.3 Signed-off-by: Juan José Mata <juanjo.mata@gmail.com> * fix: remove account_id clearing for Enable Banking accounts * fix: Remove unexisting available_balance attribute and rename variable for consistency --------- Signed-off-by: soky srm <sokysrm@gmail.com> Signed-off-by: Juan José Mata <juanjo.mata@gmail.com> Co-authored-by: Juan José Mata <juanjo.mata@gmail.com> Co-authored-by: soky srm <sokysrm@gmail.com> Co-authored-by: Marcon Neves <marconwillian@icloud.com> Co-authored-by: Leonardo Ralph <theleoralph@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: jjmata <187772+jjmata@users.noreply.github.com>
This commit is contained in:
94
app/controllers/concerns/enable_banking_items/maps_helper.rb
Normal file
94
app/controllers/concerns/enable_banking_items/maps_helper.rb
Normal file
@@ -0,0 +1,94 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module EnableBankingItems
|
||||
module MapsHelper
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
# Build per-item maps consumed by the enable_banking_item partial.
|
||||
# Accepts a single EnableBankingItem or a collection.
|
||||
def build_enable_banking_maps_for(items)
|
||||
items = Array(items).compact
|
||||
return if items.empty?
|
||||
|
||||
@enable_banking_sync_stats_map ||= {}
|
||||
@enable_banking_has_unlinked_map ||= {}
|
||||
@enable_banking_unlinked_count_map ||= {}
|
||||
@enable_banking_duplicate_only_map ||= {}
|
||||
@enable_banking_show_relink_map ||= {}
|
||||
|
||||
# Batch-check if ANY family has manual accounts (same result for all items from same family)
|
||||
family_ids = items.map { |i| i.family_id }.uniq
|
||||
families_with_manuals = Account
|
||||
.visible_manual
|
||||
.where(family_id: family_ids)
|
||||
.distinct
|
||||
.pluck(:family_id)
|
||||
.to_set
|
||||
|
||||
# Batch-fetch unlinked counts for all items in one query
|
||||
unlinked_counts = EnableBankingAccount
|
||||
.where(enable_banking_item_id: items.map(&:id))
|
||||
.left_joins(:account, :account_provider)
|
||||
.where(accounts: { id: nil }, account_providers: { id: nil })
|
||||
.group(:enable_banking_item_id)
|
||||
.count
|
||||
|
||||
items.each do |item|
|
||||
# Latest sync stats (avoid N+1; rely on includes(:syncs) where appropriate)
|
||||
latest_sync = if item.syncs.loaded?
|
||||
item.syncs.max_by(&:created_at)
|
||||
else
|
||||
item.syncs.ordered.first
|
||||
end
|
||||
stats = (latest_sync&.sync_stats || {})
|
||||
@enable_banking_sync_stats_map[item.id] = stats
|
||||
|
||||
# Whether the family has any manual accounts available to link (from batch query)
|
||||
@enable_banking_has_unlinked_map[item.id] = families_with_manuals.include?(item.family_id)
|
||||
|
||||
# Count from batch query (defaults to 0 if not found)
|
||||
@enable_banking_unlinked_count_map[item.id] = unlinked_counts[item.id] || 0
|
||||
|
||||
# Whether all reported errors for this item are duplicate-account warnings
|
||||
@enable_banking_duplicate_only_map[item.id] = compute_duplicate_only_flag(stats)
|
||||
|
||||
# Compute CTA visibility: show relink only when there are zero unlinked SFAs,
|
||||
# there exist manual accounts to link, and the item has at least one SFA
|
||||
begin
|
||||
unlinked_count = @enable_banking_unlinked_count_map[item.id] || 0
|
||||
manuals_exist = @enable_banking_has_unlinked_map[item.id]
|
||||
sfa_any = if item.enable_banking_accounts.loaded?
|
||||
item.enable_banking_accounts.any?
|
||||
else
|
||||
item.enable_banking_accounts.exists?
|
||||
end
|
||||
@enable_banking_show_relink_map[item.id] = (unlinked_count.to_i == 0 && manuals_exist && sfa_any)
|
||||
rescue StandardError => e
|
||||
Rails.logger.warn("Enable Banking card: CTA computation failed for item #{item.id}: #{e.class} - #{e.message}")
|
||||
@enable_banking_show_relink_map[item.id] = false
|
||||
end
|
||||
end
|
||||
|
||||
# Ensure maps are hashes even when items empty
|
||||
@enable_banking_sync_stats_map ||= {}
|
||||
@enable_banking_has_unlinked_map ||= {}
|
||||
@enable_banking_unlinked_count_map ||= {}
|
||||
@enable_banking_duplicate_only_map ||= {}
|
||||
@enable_banking_show_relink_map ||= {}
|
||||
end
|
||||
|
||||
private
|
||||
def compute_duplicate_only_flag(stats)
|
||||
errs = Array(stats && stats["errors"]).map do |e|
|
||||
if e.is_a?(Hash)
|
||||
e["message"] || e[:message]
|
||||
else
|
||||
e.to_s
|
||||
end
|
||||
end
|
||||
errs.present? && errs.all? { |m| m.to_s.downcase.include?("duplicate upstream account detected") }
|
||||
rescue
|
||||
false
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,7 +1,12 @@
|
||||
class EnableBankingItemsController < ApplicationController
|
||||
include EnableBankingItems::MapsHelper
|
||||
before_action :set_enable_banking_item, only: [ :update, :destroy, :sync, :select_bank, :authorize, :reauthorize, :setup_accounts, :complete_account_setup, :new_connection ]
|
||||
skip_before_action :verify_authenticity_token, only: [ :callback ]
|
||||
|
||||
def new
|
||||
@enable_banking_item = Current.family.enable_banking_items.build
|
||||
end
|
||||
|
||||
def create
|
||||
@enable_banking_item = Current.family.enable_banking_items.build(enable_banking_item_params)
|
||||
@enable_banking_item.name ||= "Enable Banking Connection"
|
||||
@@ -150,7 +155,7 @@ class EnableBankingItemsController < ApplicationController
|
||||
rescue Provider::EnableBanking::EnableBankingError => e
|
||||
if e.message.include?("REDIRECT_URI_NOT_ALLOWED")
|
||||
Rails.logger.error "Enable Banking redirect URI not allowed: #{e.message}"
|
||||
redirect_to settings_providers_path, alert: t(".redirect_uri_not_allowed", default: "Redirect not allowew. Configure `%{callback_url}` in your Enable Banking application settings.", callback_url: enable_banking_callback_url)
|
||||
redirect_to settings_providers_path, alert: t(".redirect_uri_not_allowed", default: "Redirect not allowed. Configure `%{callback_url}` in your Enable Banking application settings.", callback_url: enable_banking_callback_url)
|
||||
else
|
||||
Rails.logger.error "Enable Banking authorization error: #{e.message}"
|
||||
redirect_to settings_providers_path, alert: t(".authorization_failed", default: "Failed to start authorization: %{message}", message: e.message)
|
||||
@@ -403,6 +408,115 @@ class EnableBankingItemsController < ApplicationController
|
||||
redirect_to accounts_path, status: :see_other
|
||||
end
|
||||
|
||||
def select_existing_account
|
||||
@account = Current.family.accounts.find(params[:account_id])
|
||||
|
||||
# Filter out Enable Banking accounts that are already linked to any account
|
||||
# (either via account_provider or legacy account association)
|
||||
@available_enable_banking_accounts = Current.family.enable_banking_items
|
||||
.includes(:enable_banking_accounts)
|
||||
.flat_map(&:enable_banking_accounts)
|
||||
.reject { |sfa| sfa.account_provider.present? || sfa.account.present? }
|
||||
.sort_by { |sfa| sfa.updated_at || sfa.created_at }
|
||||
.reverse
|
||||
|
||||
# Always render a modal: either choices or a helpful empty-state
|
||||
render :select_existing_account, layout: false
|
||||
end
|
||||
|
||||
def link_existing_account
|
||||
@account = Current.family.accounts.find(params[:account_id])
|
||||
enable_banking_account = EnableBankingAccount.find(params[:enable_banking_account_id])
|
||||
|
||||
# Guard: only manual accounts can be linked (no existing provider links or legacy IDs)
|
||||
if @account.account_providers.any? || @account.plaid_account_id.present? || @account.simplefin_account_id.present?
|
||||
flash[:alert] = "Only manual accounts can be linked"
|
||||
if turbo_frame_request?
|
||||
return render turbo_stream: Array(flash_notification_stream_items)
|
||||
else
|
||||
return redirect_to account_path(@account), alert: flash[:alert]
|
||||
end
|
||||
end
|
||||
|
||||
# Verify the Enable Banking account belongs to this family's Enable Banking items
|
||||
unless enable_banking_account.enable_banking_item.present? &&
|
||||
Current.family.enable_banking_items.include?(enable_banking_account.enable_banking_item)
|
||||
flash[:alert] = "Invalid Enable Banking account selected"
|
||||
if turbo_frame_request?
|
||||
render turbo_stream: Array(flash_notification_stream_items)
|
||||
else
|
||||
redirect_to account_path(@account), alert: flash[:alert]
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
# Relink behavior: detach any legacy link and point provider link at the chosen account
|
||||
Account.transaction do
|
||||
enable_banking_account.lock!
|
||||
|
||||
# Upsert the AccountProvider mapping deterministically
|
||||
ap = AccountProvider.find_or_initialize_by(provider: enable_banking_account)
|
||||
previous_account = ap.account
|
||||
ap.account_id = @account.id
|
||||
ap.save!
|
||||
|
||||
# If the provider was previously linked to a different account in this family,
|
||||
# and that account is now orphaned, quietly disable it so it disappears from the
|
||||
# visible manual list. This mirrors the unified flow expectation that the provider
|
||||
# follows the chosen account.
|
||||
if previous_account && previous_account.id != @account.id && previous_account.family_id == @account.family_id
|
||||
begin
|
||||
previous_account.disable!
|
||||
rescue => e
|
||||
Rails.logger.warn("Failed to disable orphaned account #{previous_account.id}: #{e.class} - #{e.message}")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if turbo_frame_request?
|
||||
# Reload the item to ensure associations are fresh
|
||||
enable_banking_account.reload
|
||||
item = enable_banking_account.enable_banking_item
|
||||
item.reload
|
||||
|
||||
# Recompute data needed by Accounts#index partials
|
||||
@manual_accounts = Account.uncached {
|
||||
Current.family.accounts
|
||||
.visible_manual
|
||||
.order(:name)
|
||||
.to_a
|
||||
}
|
||||
@enable_banking_items = Current.family.enable_banking_items.ordered.includes(:syncs)
|
||||
build_enable_banking_maps_for(@enable_banking_items)
|
||||
|
||||
flash[:notice] = "Account successfully linked to Enable Banking"
|
||||
@account.reload
|
||||
manual_accounts_stream = if @manual_accounts.any?
|
||||
turbo_stream.update(
|
||||
"manual-accounts",
|
||||
partial: "accounts/index/manual_accounts",
|
||||
locals: { accounts: @manual_accounts }
|
||||
)
|
||||
else
|
||||
turbo_stream.replace("manual-accounts", view_context.tag.div(id: "manual-accounts"))
|
||||
end
|
||||
|
||||
render turbo_stream: [
|
||||
# Optimistic removal of the specific account row if it exists in the DOM
|
||||
turbo_stream.remove(ActionView::RecordIdentifier.dom_id(@account)),
|
||||
manual_accounts_stream,
|
||||
turbo_stream.replace(
|
||||
ActionView::RecordIdentifier.dom_id(item),
|
||||
partial: "enable_banking_items/enable_banking_item",
|
||||
locals: { enable_banking_item: item }
|
||||
),
|
||||
turbo_stream.replace("modal", view_context.turbo_frame_tag("modal"))
|
||||
] + Array(flash_notification_stream_items)
|
||||
else
|
||||
redirect_to accounts_path(cache_bust: SecureRandom.hex(6)), notice: "Account successfully linked to Enable Banking", status: :see_other
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def set_enable_banking_item
|
||||
|
||||
Reference in New Issue
Block a user