Remove manual merchant management (rules will replace)

test/models/provider/synth_test.rb

@@ -8,9 +8,6 @@ class Provider::SynthTest < ActiveSupport::TestCase
     @subject = @synth = Provider::Synth.new(ENV["SYNTH_API_KEY"])
   end
 
-  test "health check" do
-    VCR.use_cassette("synth/health") do
-      assert @synth.healthy?
   test "health check" do
     VCR.use_cassette("synth/health") do
       assert @synth.healthy?

test/models/rule/action_test.rb

@@ -8,14 +8,13 @@ class Rule::ActionTest < ActiveSupport::TestCase
     @transaction_rule = @family.rules.create!(resource_type: "transaction")
     @account = @family.accounts.create!(name: "Rule test", balance: 1000, currency: "USD", accountable: Depository.new)
 
-    @grocery_category = @family.categories.create!(name: "Grocery")
-    @whole_foods_merchant = @family.merchants.create!(name: "Whole Foods")
+    @shopping_category = @family.categories.create!(name: "Shopping")
 
     # Some sample transactions to work with
-    create_transaction(date: Date.current, account: @account, amount: 100, name: "Rule test transaction1", merchant: @whole_foods_merchant)
+    create_transaction(date: Date.current, account: @account, amount: 100, name: "Rule test transaction1", merchant: merchants(:amazon))
     create_transaction(date: Date.current, account: @account, amount: -200, name: "Rule test transaction2")
     create_transaction(date: 1.day.ago.to_date, account: @account, amount: 50, name: "Rule test transaction3")
-    create_transaction(date: 1.year.ago.to_date, account: @account, amount: 10, name: "Rule test transaction4", merchant: @whole_foods_merchant)
+    create_transaction(date: 1.year.ago.to_date, account: @account, amount: 10, name: "Rule test transaction4", merchant: merchants(:amazon))
     create_transaction(date: 1.year.ago.to_date, account: @account, amount: 1000, name: "Rule test transaction5")
 
     @rule_scope = @account.transactions
@@ -25,13 +24,13 @@ class Rule::ActionTest < ActiveSupport::TestCase
     action = Rule::Action.new(
       rule: @transaction_rule,
       action_type: "set_transaction_category",
-      value: @grocery_category.id
+      value: @shopping_category.id
     )
 
     action.apply(@rule_scope)
 
     @rule_scope.reload.each do |transaction|
-      assert_equal @grocery_category.id, transaction.category_id
+      assert_equal @shopping_category.id, transaction.category_id
     end
   end
 end

test/models/rule/condition_test.rb

@@ -8,14 +8,13 @@ class Rule::ConditionTest < ActiveSupport::TestCase
     @transaction_rule = @family.rules.create!(resource_type: "transaction")
     @account = @family.accounts.create!(name: "Rule test", balance: 1000, currency: "USD", accountable: Depository.new)
 
-    @grocery_category = @family.categories.create!(name: "Grocery")
-    @whole_foods_merchant = @family.merchants.create!(name: "Whole Foods")
+    @shopping_category = @family.categories.create!(name: "Shopping")
 
     # Some sample transactions to work with
-    create_transaction(date: Date.current, account: @account, amount: 100, name: "Rule test transaction1", merchant: @whole_foods_merchant)
+    create_transaction(date: Date.current, account: @account, amount: 100, name: "Rule test transaction1", merchant: merchants(:amazon))
     create_transaction(date: Date.current, account: @account, amount: -200, name: "Rule test transaction2")
     create_transaction(date: 1.day.ago.to_date, account: @account, amount: 50, name: "Rule test transaction3")
-    create_transaction(date: 1.year.ago.to_date, account: @account, amount: 10, name: "Rule test transaction4", merchant: @whole_foods_merchant)
+    create_transaction(date: 1.year.ago.to_date, account: @account, amount: 10, name: "Rule test transaction4", merchant: merchants(:amazon))
     create_transaction(date: 1.year.ago.to_date, account: @account, amount: 1000, name: "Rule test transaction5")
 
     @rule_scope = @account.transactions
@@ -53,7 +52,7 @@ class Rule::ConditionTest < ActiveSupport::TestCase
       rule: @transaction_rule,
       condition_type: "transaction_merchant",
       operator: "=",
-      value: "Whole Foods"
+      value: "Amazon"
     )
 
     filtered = condition.apply(@rule_scope)
@@ -69,7 +68,7 @@ class Rule::ConditionTest < ActiveSupport::TestCase
         Rule::Condition.new(
           condition_type: "transaction_merchant",
           operator: "=",
-          value: "Whole Foods"
+          value: "Amazon"
         ),
         Rule::Condition.new(
           condition_type: "transaction_amount",
@@ -92,7 +91,7 @@ class Rule::ConditionTest < ActiveSupport::TestCase
         Rule::Condition.new(
           condition_type: "transaction_merchant",
           operator: "=",
-          value: "Whole Foods"
+          value: "Amazon"
         ),
         Rule::Condition.new(
           condition_type: "transaction_amount",

test/models/rule_test.rb

@@ -6,31 +6,30 @@ class RuleTest < ActiveSupport::TestCase
   setup do
     @family = families(:empty)
     @account = @family.accounts.create!(name: "Rule test", balance: 1000, currency: "USD", accountable: Depository.new)
-    @whole_foods_merchant = @family.merchants.create!(name: "Whole Foods")
-    @groceries_category = @family.categories.create!(name: "Groceries")
+    @shopping_category = @family.categories.create!(name: "Shopping")
   end
 
   test "basic rule" do
-    transaction_entry = create_transaction(date: Date.current, account: @account, merchant: @whole_foods_merchant)
+    transaction_entry = create_transaction(date: Date.current, account: @account, merchant: merchants(:amazon))
 
     rule = Rule.create!(
       family: @family,
       resource_type: "transaction",
       effective_date: 1.day.ago.to_date,
-      conditions: [ Rule::Condition.new(condition_type: "transaction_merchant", operator: "=", value: "Whole Foods") ],
-      actions: [ Rule::Action.new(action_type: "set_transaction_category", value: "Groceries") ]
+      conditions: [ Rule::Condition.new(condition_type: "transaction_merchant", operator: "=", value: "Amazon") ],
+      actions: [ Rule::Action.new(action_type: "set_transaction_category", value: @shopping_category.id) ]
     )
 
     rule.apply
 
     transaction_entry.reload
 
-    assert_equal @groceries_category, transaction_entry.account_transaction.category
+    assert_equal @shopping_category, transaction_entry.account_transaction.category
   end
 
   test "compound rule" do
-    transaction_entry1 = create_transaction(date: Date.current, amount: 50, account: @account, merchant: @whole_foods_merchant)
-    transaction_entry2 = create_transaction(date: Date.current, amount: 100, account: @account, merchant: @whole_foods_merchant)
+    transaction_entry1 = create_transaction(date: Date.current, amount: 50, account: @account, merchant: merchants(:amazon))
+    transaction_entry2 = create_transaction(date: Date.current, amount: 100, account: @account, merchant: merchants(:amazon))
 
     # Assign "Groceries" to transactions with a merchant of "Whole Foods" and an amount greater than $60
     rule = Rule.create!(
@@ -39,11 +38,11 @@ class RuleTest < ActiveSupport::TestCase
       effective_date: 1.day.ago.to_date,
       conditions: [
         Rule::Condition.new(condition_type: "compound", operator: "and", sub_conditions: [
-          Rule::Condition.new(condition_type: "transaction_merchant", operator: "=", value: "Whole Foods"),
+          Rule::Condition.new(condition_type: "transaction_merchant", operator: "=", value: "Amazon"),
           Rule::Condition.new(condition_type: "transaction_amount", operator: ">", value: 60)
         ])
       ],
-      actions: [ Rule::Action.new(action_type: "set_transaction_category", value: "Groceries") ]
+      actions: [ Rule::Action.new(action_type: "set_transaction_category", value: @shopping_category.id) ]
     )
 
     rule.apply
@@ -52,6 +51,6 @@ class RuleTest < ActiveSupport::TestCase
     transaction_entry2.reload
 
     assert_nil transaction_entry1.account_transaction.category
-    assert_equal @groceries_category, transaction_entry2.account_transaction.category
+    assert_equal @shopping_category, transaction_entry2.account_transaction.category
   end
 end

test/models/transaction_import_test.rb

@@ -63,7 +63,7 @@ class TransactionImportTest < ActiveSupport::TestCase
                       -> { Tag.count } => 1,
                       -> { Category.count } => 1,
                       -> { Account.count } => 1 do
-      @import.publish
+      result = @import.publish
     end
 
     assert_equal "complete", @import.status