<%= loan_form.number_field :interest_rate,
label: t("loans.form.interest_rate"),
diff --git a/app/views/transactions/_form.html.erb b/app/views/transactions/_form.html.erb
index d671b664..16046a58 100644
--- a/app/views/transactions/_form.html.erb
+++ b/app/views/transactions/_form.html.erb
@@ -42,7 +42,7 @@
multiple: true,
label: t(".tags_label"),
container_class: "h-40"
- }%>
+ } %>
<% end %>
<%= f.text_area :notes,
label: t(".note_label"),
diff --git a/app/views/transactions/_selection_bar.html.erb b/app/views/transactions/_selection_bar.html.erb
index 1ab10771..fada06aa 100644
--- a/app/views/transactions/_selection_bar.html.erb
+++ b/app/views/transactions/_selection_bar.html.erb
@@ -7,7 +7,7 @@
<%= turbo_frame_tag "bulk_transaction_edit_drawer" %>
- <%= link_to new_transactions_bulk_update_path,
+ <%= link_to new_transactions_bulk_update_path,
class: "p-1.5 group hover:bg-gray-700 flex items-center justify-center rounded-md",
title: "Edit",
data: { turbo_frame: "bulk_transaction_edit_drawer" } do %>
diff --git a/db/migrate/20250304200956_add_signage_type_to_imports.rb b/db/migrate/20250304200956_add_signage_type_to_imports.rb
new file mode 100644
index 00000000..b9651850
--- /dev/null
+++ b/db/migrate/20250304200956_add_signage_type_to_imports.rb
@@ -0,0 +1,20 @@
+class AddSignageTypeToImports < ActiveRecord::Migration[7.2]
+ def change
+ change_column_default :imports, :date_col_label, from: "date", to: nil
+ change_column_default :imports, :amount_col_label, from: "amount", to: nil
+ change_column_default :imports, :name_col_label, from: "name", to: nil
+ change_column_default :imports, :category_col_label, from: "category", to: nil
+ change_column_default :imports, :tags_col_label, from: "tags", to: nil
+ change_column_default :imports, :account_col_label, from: "account", to: nil
+ change_column_default :imports, :qty_col_label, from: "qty", to: nil
+ change_column_default :imports, :ticker_col_label, from: "ticker", to: nil
+ change_column_default :imports, :price_col_label, from: "price", to: nil
+ change_column_default :imports, :entity_type_col_label, from: "entity_type", to: nil
+ change_column_default :imports, :notes_col_label, from: "notes", to: nil
+ change_column_default :imports, :currency_col_label, from: "currency", to: nil
+
+ # User can select "custom", then assign "debit" or "credit" (or custom value) to determine inflow/outflow of txn
+ add_column :imports, :amount_type_strategy, :string, default: "signed_amount"
+ add_column :imports, :amount_type_inflow_value, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a5a5b2b5..280aae75 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -299,23 +299,25 @@ ActiveRecord::Schema[7.2].define(version: 2025_04_13_141446) do
t.uuid "family_id", null: false
t.uuid "account_id"
t.string "type", null: false
- t.string "date_col_label", default: "date"
- t.string "amount_col_label", default: "amount"
- t.string "name_col_label", default: "name"
- t.string "category_col_label", default: "category"
- t.string "tags_col_label", default: "tags"
- t.string "account_col_label", default: "account"
- t.string "qty_col_label", default: "qty"
- t.string "ticker_col_label", default: "ticker"
- t.string "price_col_label", default: "price"
- t.string "entity_type_col_label", default: "type"
- t.string "notes_col_label", default: "notes"
- t.string "currency_col_label", default: "currency"
+ t.string "date_col_label"
+ t.string "amount_col_label"
+ t.string "name_col_label"
+ t.string "category_col_label"
+ t.string "tags_col_label"
+ t.string "account_col_label"
+ t.string "qty_col_label"
+ t.string "ticker_col_label"
+ t.string "price_col_label"
+ t.string "entity_type_col_label"
+ t.string "notes_col_label"
+ t.string "currency_col_label"
t.string "date_format", default: "%m/%d/%Y"
t.string "signage_convention", default: "inflows_positive"
t.string "error"
t.string "number_format"
t.string "exchange_operating_mic_col_label"
+ t.string "amount_type_strategy", default: "signed_amount"
+ t.string "amount_type_inflow_value"
t.index ["family_id"], name: "index_imports_on_family_id"
end
diff --git a/test/interfaces/import_interface_test.rb b/test/interfaces/import_interface_test.rb
index 2dfa1bb4..2b475927 100644
--- a/test/interfaces/import_interface_test.rb
+++ b/test/interfaces/import_interface_test.rb
@@ -277,6 +277,7 @@ module ImportInterfaceTest
csv_data = "date,amount,name\n01/01/2024,1234.56,Test"
import.update!(raw_file_str: csv_data)
import.update!(
+ date_col_label: "date",
date_format: "%Y-%m-%d" # Does not match the raw CSV date, so rows will be invalid, but still generated
)
diff --git a/test/models/trade_import_test.rb b/test/models/trade_import_test.rb
index 66637fc5..f5fab129 100644
--- a/test/models/trade_import_test.rb
+++ b/test/models/trade_import_test.rb
@@ -36,6 +36,7 @@ class TradeImportTest < ActiveSupport::TestCase
CSV
@import.update!(
+ account: accounts(:depository),
raw_file_str: import,
date_col_label: "date",
ticker_col_label: "ticker",
@@ -52,16 +53,11 @@ class TradeImportTest < ActiveSupport::TestCase
@import.reload
- assert_difference [
- -> { Entry.count },
- -> { Trade.count }
- ], 2 do
- assert_difference [
- -> { Security.count },
- -> { Account.count }
- ], 1 do
- @import.publish
- end
+ assert_difference -> { Entry.count } => 2,
+ -> { Trade.count } => 2,
+ -> { Security.count } => 1,
+ -> { Account.count } => 1 do
+ @import.publish
end
assert_equal "complete", @import.status
diff --git a/test/models/transaction_import_test.rb b/test/models/transaction_import_test.rb
index c9afc553..dc94b20c 100644
--- a/test/models/transaction_import_test.rb
+++ b/test/models/transaction_import_test.rb
@@ -68,4 +68,36 @@ class TransactionImportTest < ActiveSupport::TestCase
assert_equal "complete", @import.status
end
+
+ test "imports transactions with separate type column for signage convention" do
+ import = <<~CSV
+ date,amount,amount_type
+ 01/01/2024,100,debit
+ 01/02/2024,200,credit
+ 01/03/2024,300,debit
+ CSV
+
+ @import.update!(
+ account: accounts(:depository),
+ raw_file_str: import,
+ date_col_label: "date",
+ date_format: "%m/%d/%Y",
+ amount_col_label: "amount",
+ entity_type_col_label: "amount_type",
+ amount_type_inflow_value: "debit",
+ amount_type_strategy: "custom_column",
+ signage_convention: nil # Explicitly set to nil to prove this is not needed
+ )
+
+ @import.generate_rows_from_csv
+
+ @import.reload
+
+ assert_difference -> { Entry.count } => 3,
+ -> { Transaction.count } => 3 do
+ @import.publish
+ end
+
+ assert_equal [ -100, 200, -300 ], @import.entries.map(&:amount)
+ end
end
diff --git a/test/system/imports_test.rb b/test/system/imports_test.rb
index bf7b7907..9cedd2f6 100644
--- a/test/system/imports_test.rb
+++ b/test/system/imports_test.rb
@@ -21,14 +21,14 @@ class ImportsTest < ApplicationSystemTestCase
find('input[type="submit"][value="Upload CSV"]').click
- select "Date", from: "Date*"
- select "YYYY-MM-DD", from: "Date format"
- select "Amount", from: "Amount"
- select "Account", from: "Account (optional)"
- select "Name", from: "Name (optional)"
- select "Category", from: "Category (optional)"
- select "Tags", from: "Tags (optional)"
- select "Notes", from: "Notes (optional)"
+ select "Date", from: "import[date_col_label]"
+ select "YYYY-MM-DD", from: "import[date_format]"
+ select "Amount", from: "import[amount_col_label]"
+ select "Account", from: "import[account_col_label]"
+ select "Name", from: "import[name_col_label]"
+ select "Category", from: "import[category_col_label]"
+ select "Tags", from: "import[tags_col_label]"
+ select "Notes", from: "import[notes_col_label]"
click_on "Apply configuration"
@@ -67,7 +67,12 @@ class ImportsTest < ApplicationSystemTestCase
find('input[type="submit"][value="Upload CSV"]').click
- select "YYYY-MM-DD", from: "Date format"
+ select "date", from: "import[date_col_label]"
+ select "YYYY-MM-DD", from: "import[date_format]"
+ select "qty", from: "import[qty_col_label]"
+ select "ticker", from: "import[ticker_col_label]"
+ select "price", from: "import[price_col_label]"
+ select "account", from: "import[account_col_label]"
click_on "Apply configuration"
@@ -100,6 +105,10 @@ class ImportsTest < ApplicationSystemTestCase
find('input[type="submit"][value="Upload CSV"]').click
+ select "type", from: "import[entity_type_col_label]"
+ select "name", from: "import[name_col_label]"
+ select "amount", from: "import[amount_col_label]"
+
click_on "Apply configuration"
click_on "Next step"