From de53a50e457578202821c2973b21173abc063d25 Mon Sep 17 00:00:00 2001 From: Zach Gollwitzer Date: Thu, 30 May 2024 22:06:32 -0400 Subject: [PATCH 1/3] Sync account after transaction import (#820) --- app/models/import.rb | 2 ++ app/views/imports/_sample_table.html.erb | 14 +++++++++----- app/views/imports/load.html.erb | 3 ++- config/locales/views/imports/en.yml | 1 + test/jobs/import_job_test.rb | 1 + 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/models/import.rb b/app/models/import.rb index 55a33c32..c29ec6ab 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -56,6 +56,8 @@ class Import < ApplicationRecord end end + self.account.sync + update!(status: "complete") rescue => e update!(status: "failed") diff --git a/app/views/imports/_sample_table.html.erb b/app/views/imports/_sample_table.html.erb index 83a16f5c..f4b82143 100644 --- a/app/views/imports/_sample_table.html.erb +++ b/app/views/imports/_sample_table.html.erb @@ -1,22 +1,26 @@ -
-
Date
-
Name
-
Category
-
Amount
+
+
date
+
name
+
category
+
tags
+
amount
2024-01-01
Amazon
Shopping
+
Tag1|Tag2
-24.99
2024-03-01
Spotify
+
-16.32
2023-01-06
Acme
Income
+
Tag3
151.22
diff --git a/app/views/imports/load.html.erb b/app/views/imports/load.html.erb index 68fab9b9..0565077a 100644 --- a/app/views/imports/load.html.erb +++ b/app/views/imports/load.html.erb @@ -1,6 +1,6 @@ <%= content_for :return_to_path, return_to_path(params, imports_path) %> -
+

<%= t(".load_title") %>

@@ -30,6 +30,7 @@
  • <%= t(".requirement1") %>
  • <%= t(".requirement2") %>
    • +
  • <%= t(".requirement3") %>
diff --git a/config/locales/views/imports/en.yml b/config/locales/views/imports/en.yml index 8a089ca5..2cb90411 100644 --- a/config/locales/views/imports/en.yml +++ b/config/locales/views/imports/en.yml @@ -68,6 +68,7 @@ en: requirement1: Dates must be in ISO 8601 format (YYYY-MM-DD) requirement2: Negative transaction is an "outflow" (expense), positive is an "inflow" (income) + requirement3: Can have 0 or more tags separated by | subtitle: Import your transactions load_csv: import_loaded: Import CSV loaded diff --git a/test/jobs/import_job_test.rb b/test/jobs/import_job_test.rb index 14c21339..35a0f3b5 100644 --- a/test/jobs/import_job_test.rb +++ b/test/jobs/import_job_test.rb @@ -14,5 +14,6 @@ class ImportJobTest < ActiveJob::TestCase end assert import.reload.complete? + assert import.account.balances.present? end end -- 2.53.0 From bcbb37a146042bccd32b46c07c32f0dee22c08dd Mon Sep 17 00:00:00 2001 From: Zach Gollwitzer Date: Thu, 30 May 2024 22:07:47 -0400 Subject: [PATCH 2/3] Client-side validation for Decimal precision of 19,4 (#821) --- app/helpers/application_form_builder.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/helpers/application_form_builder.rb b/app/helpers/application_form_builder.rb index 3292a1c6..dc3df84b 100644 --- a/app/helpers/application_form_builder.rb +++ b/app/helpers/application_form_builder.rb @@ -39,6 +39,8 @@ class ApplicationFormBuilder < ActionView::Helpers::FormBuilder value: money&.amount, "data-money-field-target" => "amount", placeholder: Money.new(0, currency).format, + min: -99999999999999, + max: 99999999999999, step: currency.step } -- 2.53.0 From c2a166f8cddb1da3c98c6fbd48e11bc7d236dabf Mon Sep 17 00:00:00 2001 From: Zach Gollwitzer Date: Fri, 31 May 2024 14:06:12 -0400 Subject: [PATCH 3/3] Bump to v0.1.0-alpha.4 --- config/initializers/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/version.rb b/config/initializers/version.rb index 659ec3dd..298d38ba 100644 --- a/config/initializers/version.rb +++ b/config/initializers/version.rb @@ -10,7 +10,7 @@ module Maybe private def semver - "0.1.0-alpha.3" + "0.1.0-alpha.4" end end end -- 2.53.0