Account namespace updates: part 6 (transactions) (#904)

* Move Transaction to Account namespace

* Fix improper routes, improve separation of concerns

* Replace account transactions list partial with view

* Remove logs

* Consolidate transaction views

* Remove unused code

* Transfer style tweaks

* Remove more unused code

* Add back totals by currency helper

app/controllers/account/transaction/rows_controller.rb

@@ -1,4 +1,4 @@
-class Transaction::RowsController < ApplicationController
+class Account::Transaction::RowsController < ApplicationController
   before_action :set_transaction, only: %i[ show update ]
 
   def show
@@ -7,7 +7,7 @@ class Transaction::RowsController < ApplicationController
   def update
     @transaction.update! transaction_params
 
-    redirect_to transaction_row_path(@transaction)
+    redirect_to account_transaction_row_path(@transaction.account, @transaction)
   end
 
   private
@@ -17,6 +17,6 @@ class Transaction::RowsController < ApplicationController
     end
 
     def set_transaction
-      @transaction = Current.family.transactions.find(params[:id])
+      @transaction = Current.family.accounts.find(params[:account_id]).transactions.find(params[:transaction_id])
     end
 end

app/controllers/account/transaction/rules_controller.rb

@@ -0,0 +1,6 @@
+class Account::Transaction::RulesController < ApplicationController
+  layout "with_sidebar"
+
+  def index
+  end
+end

app/controllers/account/transactions_controller.rb

@@ -0,0 +1,44 @@
+class Account::TransactionsController < ApplicationController
+  layout "with_sidebar"
+
+  before_action :set_account
+  before_action :set_transaction, only: %i[ show update destroy ]
+
+  def index
+    @transactions = @account.transactions.ordered
+  end
+
+  def show
+  end
+
+  def update
+    @transaction.update! transaction_params
+    @transaction.sync_account_later
+
+    redirect_back_or_to account_transaction_url(@transaction.account, @transaction), notice: t(".success")
+  end
+
+  def destroy
+    @transaction.destroy!
+    @transaction.sync_account_later
+    redirect_back_or_to account_url(@transaction.account), notice: t(".success")
+  end
+
+  private
+
+    def set_account
+      @account = Current.family.accounts.find(params[:account_id])
+    end
+
+    def set_transaction
+      @transaction = @account.transactions.find(params[:id])
+    end
+
+    def search_params
+      params.fetch(:q, {}).permit(:start_date, :end_date, :search, accounts: [], account_ids: [], categories: [], merchants: [])
+    end
+
+    def transaction_params
+      params.require(:transaction).permit(:name, :date, :amount, :currency, :notes, :excluded, :category_id, :merchant_id, tag_ids: [])
+    end
+end

app/controllers/pages_controller.rb

@@ -21,7 +21,7 @@ class PagesController < ApplicationController
 
     @accounts = Current.family.accounts
     @account_groups = @accounts.by_group(period: @period, currency: Current.family.currency)
-    @transactions = Current.family.transactions.limit(5).order(date: :desc)
+    @transactions = Current.family.transactions.limit(6).order(date: :desc)
 
     # TODO: Placeholders for trendlines
     placeholder_series_data = 10.times.map do |i|

app/controllers/transaction/rules_controller.rb

@@ -1,6 +0,0 @@
-class Transaction::RulesController < ApplicationController
-  layout "with_sidebar"
-
-  def index
-  end
-end

app/controllers/transactions_controller.rb

@@ -1,8 +1,6 @@
 class TransactionsController < ApplicationController
   layout "with_sidebar"
 
-  before_action :set_transaction, only: %i[ show edit update destroy ]
-
   def index
     @q = search_params
     result = Current.family.transactions.search(@q).ordered
@@ -15,41 +13,22 @@ class TransactionsController < ApplicationController
     }
   end
 
-  def show
-  end
-
   def new
-    @transaction = Transaction.new.tap do |txn|
+    @transaction = Account::Transaction.new.tap do |txn|
       if params[:account_id]
         txn.account = Current.family.accounts.find(params[:account_id])
       end
     end
   end
 
-  def edit
-  end
-
   def create
     @transaction = Current.family.accounts
-                     .find(params[:transaction][:account_id])
-                     .transactions.build(transaction_params.merge(amount: amount))
+                          .find(params[:transaction][:account_id])
+                          .transactions
+                          .create!(transaction_params.merge(amount: amount))
 
-    @transaction.save!
     @transaction.sync_account_later
-    redirect_to transactions_url, notice: t(".success")
-  end
-
-  def update
-    @transaction.update! transaction_params
-    @transaction.sync_account_later
-
-    redirect_to transaction_url(@transaction), notice: t(".success")
-  end
-
-  def destroy
-    @transaction.destroy!
-    @transaction.sync_account_later
-    redirect_to transactions_url, notice: t(".success")
+    redirect_back_or_to account_path(@transaction.account), notice: t(".success")
   end
 
   def bulk_delete
@@ -90,10 +69,6 @@ class TransactionsController < ApplicationController
 
   private
 
-    def set_transaction
-      @transaction = Current.family.transactions.find(params[:id])
-    end
-
     def amount
       if nature.income?
         transaction_params[:amount].to_d * -1
@@ -119,6 +94,6 @@ class TransactionsController < ApplicationController
     end
 
     def transaction_params
-      params.require(:transaction).permit(:name, :date, :amount, :currency, :notes, :excluded, :category_id, :merchant_id, tag_ids: [])
+      params.require(:transaction).permit(:name, :date, :amount, :currency, :category_id, tag_ids: [])
     end
 end