Transactions cleanup

.github/workflows/ci.yml

@@ -58,6 +58,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    env:
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432
+      RAILS_ENV: test
 
     services:
       postgres:
@@ -82,16 +85,19 @@ jobs:
           ruby-version: .ruby-version
           bundler-cache: true
 
-      - name: Run tests and smoke test seed
-        env:
-          RAILS_ENV: test
-          DATABASE_URL: postgres://postgres:postgres@localhost:5432
+      - name: DB Smoke test
         run: |
           bin/rails db:create
           bin/rails db:schema:load
-          bin/rails test
           bin/rails db:seed
 
+      - name: Unit and integration tests
+        run: bin/rails test
+
+      - name: System tests
+        run: DISABLE_PARALLELIZATION=true bin/rails test:system
+        continue-on-error: true # TODO: Eventually we'll enforce for PRs
+
       - name: Keep screenshots from failed system tests
         uses: actions/upload-artifact@v4
         if: failure()

Gemfile

@@ -25,9 +25,6 @@ gem "turbo-rails"
 # Background Jobs
 gem "good_job"
 
-# Search
-gem "ransack", github: "maybe-finance/ransack", branch: "main"
-
 # Error logging
 gem "stackprof"
 gem "sentry-ruby"

Gemfile.lock

@@ -5,16 +5,6 @@ GIT
     lucide-rails (0.2.0)
       railties (>= 4.1.0)
 
-GIT
-  remote: https://github.com/maybe-finance/ransack.git
-  revision: dec20edc9ccccac77f5b4b8a1c1a9f20dc58fa04
-  branch: main
-  specs:
-    ransack (4.1.1)
-      activerecord (>= 6.1.5)
-      activesupport (>= 6.1.5)
-      i18n
-
 GIT
   remote: https://github.com/rails/rails.git
   revision: c1f1b14adce5cd373ed63611486eb7a7db73c78c
@@ -494,7 +484,6 @@ DEPENDENCIES
   puma (>= 5.0)
   rails!
   rails-settings-cached
-  ransack!
   rubocop-rails-omakase
   ruby-lsp-rails
   selenium-webdriver

app/controllers/transactions/rows_controller.rb

@@ -0,0 +1,22 @@
+class Transactions::RowsController < ApplicationController
+  before_action :set_transaction, only: %i[ show update ]
+
+  def show
+  end
+
+  def update
+    @transaction.update! transaction_params
+
+    redirect_to transaction_row_path(@transaction)
+  end
+
+  private
+
+    def transaction_params
+      params.require(:transaction).permit(:category_id)
+    end
+
+    def set_transaction
+      @transaction = Current.family.transactions.find(params[:id])
+    end
+end

app/controllers/transactions_controller.rb

@@ -4,57 +4,15 @@ class TransactionsController < ApplicationController
   before_action :set_transaction, only: %i[ show edit update destroy ]
 
   def index
-    search_params = session[ransack_session_key] || params[:q]
-    @q = Current.family.transactions.ransack(search_params)
-    result = @q.result.order(date: :desc)
-    @pagy, @transactions = pagy(result, items: 10)
+    @q = search_params
+    result = Current.family.transactions.search(@q).ordered
+    @pagy, @transactions = pagy(result, items: 50)
+
     @totals = {
       count: result.count,
       income: result.inflows.sum(&:amount_money).abs,
       expense: result.outflows.sum(&:amount_money).abs
     }
-    @filter_list, valid_params = Transaction.build_filter_list(search_params, Current.family)
-    session[ransack_session_key] = valid_params
-
-    respond_to do |format|
-      format.html
-      format.turbo_stream
-    end
-  end
-
-  def search
-    if params[:clear]
-      session.delete(ransack_session_key)
-    elsif params[:remove_param]
-      current_params = session[ransack_session_key] || {}
-      if params[:remove_param] == "date_range"
-        updated_params = current_params.except("date_gteq", "date_lteq")
-      elsif params[:remove_param_value]
-        key_to_remove = params[:remove_param]
-        value_to_remove = params[:remove_param_value]
-        updated_params = current_params.deep_dup
-        updated_params[key_to_remove] = updated_params[key_to_remove] - [ value_to_remove ]
-      else
-        updated_params = current_params.except(params[:remove_param])
-      end
-      session[ransack_session_key] = updated_params
-    elsif params[:q]
-      session[ransack_session_key] = params[:q]
-    end
-
-    index
-
-    respond_to do |format|
-      format.html { render :index }
-      format.turbo_stream do
-        render turbo_stream: [
-          turbo_stream.replace("transactions_summary", partial: "transactions/summary", locals: { totals: @totals }),
-          turbo_stream.replace("transactions_search_form", partial: "transactions/search_form", locals: { q: @q }),
-          turbo_stream.replace("transactions_filters", partial: "transactions/filters", locals: { filters: @filter_list }),
-          turbo_stream.replace("transactions_list", partial: "transactions/list", locals: { transactions: @transactions, pagy: @pagy })
-        ]
-      end
-    end
   end
 
   def show
@@ -76,80 +34,28 @@ def create
                      .find(params[:transaction][:account_id])
                      .transactions.build(transaction_params.merge(amount: amount))
 
-    respond_to do |format|
-      if @transaction.save
-        @transaction.account.sync_later(@transaction.date)
-        format.html { redirect_to transactions_url, notice: t(".success") }
-      else
-        format.html { render :new, status: :unprocessable_entity }
-      end
-    end
+    @transaction.save!
+    @transaction.sync_account_later
+    redirect_to transactions_url, notice: t(".success")
   end
 
   def update
-    respond_to do |format|
-      sync_start_date = if transaction_params[:date]
-                          [ @transaction.date, Date.parse(transaction_params[:date]) ].compact.min
-      else
-        @transaction.date
-      end
-
-      if params[:transaction][:tag_id].present?
-        tag = Current.family.tags.find(params[:transaction][:tag_id])
-        @transaction.tags << tag unless @transaction.tags.include?(tag)
-      end
+    @transaction.update! transaction_params
+    @transaction.sync_account_later
 
-      if params[:transaction][:remove_tag_id].present?
-        @transaction.tags.delete(params[:transaction][:remove_tag_id])
-      end
-
-      if @transaction.update(transaction_params)
-        @transaction.account.sync_later(sync_start_date)
-
-        format.html { redirect_to transaction_url(@transaction), notice: t(".success") }
-        format.turbo_stream do
-          render turbo_stream: [
-            turbo_stream.append("notification-tray", partial: "shared/notification", locals: { type: "success", content: { body: t(".success") } }),
-            turbo_stream.replace("transaction_#{@transaction.id}", partial: "transactions/transaction", locals: { transaction: @transaction })
-          ]
-        end
-      else
-        format.html { render :edit, status: :unprocessable_entity }
-      end
-    end
+    redirect_to transaction_url(@transaction), notice: t(".success")
   end
 
   def destroy
-    @account = @transaction.account
-    sync_start_date = @account.transactions.where("date < ?", @transaction.date).order(date: :desc).first&.date
     @transaction.destroy!
-    @account.sync_later(sync_start_date)
-
-    respond_to do |format|
-      format.html { redirect_to transactions_url, notice: t(".success") }
-    end
+    @transaction.sync_account_later
+    redirect_to transactions_url, notice: t(".success")
   end
 
   private
 
-    def delete_search_param(params, key, value: nil)
-      if value
-        params[key]&.delete(value)
-        params.delete(key) if params[key].empty? # Remove key if it's empty after deleting value
-      else
-        params.delete(key)
-      end
-
-      params
-    end
-
-    def ransack_session_key
-      :ransack_transactions_q
-    end
-
-    # Use callbacks to share common setup or constraints between actions.
     def set_transaction
-      @transaction = Transaction.find(params[:id])
+      @transaction = Current.family.transactions.find(params[:id])
     end
 
     def amount
@@ -164,7 +70,11 @@ def nature
       params[:transaction][:nature].to_s.inquiry
     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_id, :remove_tag_id).except(:tag_id, :remove_tag_id)
+      params.require(:transaction).permit(:name, :date, :amount, :currency, :notes, :excluded, :category_id, :merchant_id, tag_ids: [], taggings_attributes: [ :id, :tag_id, :_destroy ])
     end
 end

app/helpers/application_helper.rb

@@ -20,23 +20,37 @@ def notification(text, **options, &block)
     render partial: "shared/notification", locals: { type: options[:type], content: { body: content } }
   end
 
-  # Wrap view with <%= modal do %> ... <% end %> to have it open in a modal
-  # Make sure to add data-turbo-frame="modal" to the link/button that opens the modal
+  ##
+  # Helper to open a centered and overlayed modal with custom contents
+  #
+  # @example Basic usage
+  #   <%= modal classes: "custom-class" do %>
+  #     <div>Content here</div>
+  #   <% end %>
+  #
   def modal(options = {}, &block)
     content = capture &block
     render partial: "shared/modal", locals: { content:, classes: options[:classes] }
   end
 
+  ##
+  # Helper to open a drawer on the right side of the screen with custom contents
+  #
+  # @example Basic usage
+  #   <%= drawer do %>
+  #     <div>Content here</div>
+  #   <% end %>
+  #
+  def drawer(&block)
+    content = capture &block
+    render partial: "shared/drawer", locals: { content: content }
+  end
+
   def account_groups(period: nil)
     assets, liabilities = Current.family.accounts.by_group(currency: Current.family.currency, period: period || Period.last_30_days).values_at(:assets, :liabilities)
     [ assets.children, liabilities.children ].flatten
   end
 
-  def sidebar_modal(&block)
-    content = capture &block
-    render partial: "shared/sidebar_modal", locals: { content: content }
-  end
-
   def sidebar_link_to(name, path, options = {})
     is_current = current_page?(path) || (request.path.start_with?(path) && path != "/")
 

app/helpers/transactions/searches_helper.rb

@@ -0,0 +1,37 @@
+module Transactions::SearchesHelper
+  def transaction_search_filters
+    [
+      { key: "account_filter", name: "Account", icon: "layers" },
+      { key: "date_filter", name: "Date", icon: "calendar" },
+      { key: "type_filter", name: "Type", icon: "shapes" },
+      { key: "amount_filter", name: "Amount", icon: "hash" },
+      { key: "category_filter", name: "Category", icon: "tag" },
+      { key: "merchant_filter", name: "Merchant", icon: "store" }
+    ]
+  end
+
+  def get_transaction_search_filter_partial_path(filter)
+    "transactions/searches/filters/#{filter[:key]}"
+  end
+
+  def get_default_transaction_search_filter
+    transaction_search_filters[0]
+  end
+
+  def transactions_path_without_param(param_key, param_value)
+    updated_params = request.query_parameters.deep_dup
+
+    q_params = updated_params[:q] || {}
+
+    current_value = q_params[param_key]
+    if current_value.is_a?(Array)
+      q_params[param_key] = current_value - [ param_value ]
+    else
+      q_params.delete(param_key)
+    end
+
+    updated_params[:q] = q_params
+
+    transactions_path(updated_params)
+  end
+end

app/helpers/transactions_helper.rb

@@ -1,24 +1,20 @@
 module TransactionsHelper
-  def transaction_filters
-    [
-      { name: "Account", partial: "account_filter", icon: "layers" },
-      { name: "Date", partial: "date_filter", icon: "calendar" },
-      { name: "Type", partial: "type_filter", icon: "shapes" },
-      { name: "Amount", partial: "amount_filter", icon: "hash" },
-      { name: "Category", partial: "category_filter", icon: "tag" },
-      { name: "Merchant", partial: "merchant_filter", icon: "store" }
-    ]
-  end
+  def transactions_group(date, transactions, transaction_partial_path = "transactions/transaction")
+    header_left = content_tag :span do
+      "#{date.strftime('%b %d, %Y')} · #{transactions.size}".html_safe
+    end
 
-  def transaction_filter_id(filter)
-    "txn-#{filter[:name].downcase}-filter"
-  end
+    header_right = content_tag :span do
+      format_money(-transactions.sum(&:amount_money))
+    end
 
-  def transaction_filter_by_name(name)
-    transaction_filters.find { |filter| filter[:name] == name }
-  end
+    header = header_left.concat(header_right)
+
+    content = render partial: transaction_partial_path, collection: transactions
 
-  def full_width_transaction_row?(route)
-    route != "/"
+    render partial: "shared/list_group", locals: {
+      header: header,
+      content: content
+    }
   end
 end

app/models/account.rb

@@ -22,10 +22,6 @@ class Account < ApplicationRecord
 
   delegated_type :accountable, types: Accountable::TYPES, dependent: :destroy
 
-  def self.ransackable_attributes(auth_object = nil)
-    %w[name id]
-  end
-
   def balance_on(date)
     balances.where("date <= ?", date).order(date: :desc).first&.balance
   end