mirror of
https://github.com/maybe-finance/maybe.git
synced 2025-07-19 05:09:38 +02:00
d75be2282b
Since the very first 0.1.0-alpha.1 release, we've been moving quickly to add new features to the Maybe app. In doing so, some parts of the codebase have become outdated, unnecessary, or overly-complex as a natural result of this feature prioritization. Now that "core" Maybe is complete, we're moving into a second phase of development where we'll be working hard to improve the accuracy of existing features and build additional features on top of "core". This PR is a quick overhaul of the existing codebase aimed to: - Establish the brand new and simplified dashboard view (pictured above) - Establish and move towards the conventions introduced in Cursor rules and project design overview #1788 - Consolidate layouts and improve the performance of layout queries - Organize the core models of the Maybe domain (i.e. Account::Entry, Account::Transaction, etc.) and break out specific traits of each model into dedicated concerns for better readability - Remove stale / dead code from codebase - Remove overly complex code paths in favor of simpler ones
52 lines
1.9 KiB
Ruby
52 lines
1.9 KiB
Ruby
class Account::TransactionSearch
|
|
include ActiveModel::Model
|
|
include ActiveModel::Attributes
|
|
|
|
attribute :search, :string
|
|
attribute :amount, :string
|
|
attribute :amount_operator, :string
|
|
attribute :types, array: true
|
|
attribute :accounts, array: true
|
|
attribute :account_ids, array: true
|
|
attribute :start_date, :string
|
|
attribute :end_date, :string
|
|
attribute :categories, array: true
|
|
attribute :merchants, array: true
|
|
attribute :tags, array: true
|
|
|
|
# Returns array of Account::Entry objects to stay consistent with partials, which only deal with Account::Entry
|
|
def build_query(scope)
|
|
query = scope.joins(entry: :account)
|
|
|
|
if types.present? && types.exclude?("transfer")
|
|
query = query.joins("LEFT JOIN transfers ON transfers.inflow_transaction_id = account_entries.id OR transfers.outflow_transaction_id = account_entries.id")
|
|
.where("transfers.id IS NULL")
|
|
end
|
|
|
|
if categories.present?
|
|
if categories.exclude?("Uncategorized")
|
|
query = query
|
|
.joins(:category)
|
|
.where(categories: { name: categories })
|
|
else
|
|
query = query
|
|
.left_joins(:category)
|
|
.where(categories: { name: categories })
|
|
.or(query.where(category_id: nil))
|
|
end
|
|
end
|
|
|
|
query = query.joins(:merchant).where(merchants: { name: merchants }) if merchants.present?
|
|
|
|
query = query.joins(:tags).where(tags: { name: tags }) if tags.present?
|
|
|
|
# Apply common entry search filters
|
|
query = Account::EntrySearch.apply_search_filter(query, search)
|
|
query = Account::EntrySearch.apply_date_filters(query, start_date, end_date)
|
|
query = Account::EntrySearch.apply_type_filter(query, types)
|
|
query = Account::EntrySearch.apply_amount_filter(query, amount, amount_operator)
|
|
query = Account::EntrySearch.apply_accounts_filter(query, accounts, account_ids)
|
|
|
|
query
|
|
end
|
|
end
|