Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-08-02 20:15:22 +02:00
Code Issues Releases Activity Actions

Move merchants to top-level namespace (#895)

Browse source
This commit is contained in:
Zach Gollwitzer 2024-06-20 08:38:59 -04:00 • committed by GitHub
parent 2681dd96b1
commit dc3147c101
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 153 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/family.rb
View file

@ -6,7 +6,7 @@ class Family < ApplicationRecord
has_many :transactions, through: :accounts
has_many :imports, through: :accounts
has_many :categories, dependent: :destroy
has_many :transaction_merchants, dependent: :destroy, class_name: "Transaction::Merchant"
has_many :merchants, dependent: :destroy
def snapshot(period = Period.all)
query = accounts.active.joins(:balances)

2
app/models/transaction/merchant.rb → app/models/merchant.rb
View file

@ -1,4 +1,4 @@
class Transaction::Merchant < ApplicationRecord
class Merchant < ApplicationRecord
has_many :transactions, dependent: :nullify
belongs_to :family

2
app/models/transaction.rb
View file

@ -21,7 +21,7 @@ class Transaction < ApplicationRecord
scope :with_categories, ->(categories) { joins(:category).where(categories: { name: categories }) }
scope :with_accounts, ->(accounts) { joins(:account).where(accounts: { name: accounts }) }
scope :with_account_ids, ->(account_ids) { joins(:account).where(accounts: { id: account_ids }) }
scope :with_merchants, ->(merchants) { joins(:merchant).where(transaction_merchants: { name: merchants }) }
scope :with_merchants, ->(merchants) { joins(:merchant).where(merchants: { name: merchants }) }
scope :on_or_after_date, ->(date) { where("transactions.date >= ?", date) }
scope :on_or_before_date, ->(date) { where("transactions.date <= ?", date) }
scope :with_converted_amount, ->(currency = Current.family.currency) {