fix: propose envelopes no matter how opposing account was found (#743)

This fixes the proposed envelope to work with rename rules.

Fixes #735.

Author: morremeyer

pkg/controllers/import.go

@@ -171,6 +171,20 @@ func (co Controller) ImportYnabImportPreview(c *gin.Context) {
 		}
 
 		duplicateTransactions(co, &transaction, account.BudgetID)
+
+		// Recommend an envelope
+		if transaction.Transaction.SourceAccountID != account.ID && transaction.Transaction.SourceAccountID != uuid.Nil {
+			err = recommendEnvelope(co, &transaction, transaction.Transaction.SourceAccountID)
+			if err != nil {
+				httperrors.Handler(c, err)
+			}
+		} else if transaction.Transaction.DestinationAccountID != account.ID && transaction.Transaction.DestinationAccountID != uuid.Nil {
+			err = recommendEnvelope(co, &transaction, transaction.Transaction.DestinationAccountID)
+			if err != nil {
+				httperrors.Handler(c, err)
+			}
+		}
+
 		transactions[i] = transaction
 	}
 
@@ -331,16 +345,6 @@ func findAccounts(co Controller, transaction *importer.TransactionPreview, budge
 		} else {
 			transaction.Transaction.DestinationAccountID = accounts[0].ID
 		}
-
-		// Preset the most popular recent envelope
-		recentEnvelopes, err := accounts[0].RecentEnvelopes(co.DB)
-		if err != nil {
-			return err
-		}
-
-		if len(recentEnvelopes) > 0 && recentEnvelopes[0].ID != uuid.Nil {
-			transaction.Transaction.EnvelopeID = &recentEnvelopes[0].ID
-		}
 	}
 
 	return nil
@@ -368,3 +372,25 @@ func rename(transaction *importer.TransactionPreview, rules []models.RenameRule)
 		transaction.Transaction.DestinationAccountID, transaction.RenameRuleID = replace(transaction.DestinationAccountName)
 	}
 }
+
+// recommendEnvelope sets the first of the recommended envelopes for the opposing account.
+func recommendEnvelope(co Controller, transaction *importer.TransactionPreview, id uuid.UUID) error {
+	// Load the account
+	var opposingAccount models.Account
+	err := co.DB.First(&opposingAccount, models.Account{DefaultModel: models.DefaultModel{ID: id}}).Error
+	if err != nil {
+		return err
+	}
+
+	// Preset the most popular recent envelope
+	recentEnvelopes, err := opposingAccount.RecentEnvelopes(co.DB)
+	if err != nil {
+		return err
+	}
+
+	if len(recentEnvelopes) > 0 {
+		transaction.Transaction.EnvelopeID = &recentEnvelopes[0].ID
+	}
+
+	return nil
+}

pkg/controllers/import_test.go

@@ -259,16 +259,23 @@ func (suite *TestSuiteStandard) TestRename() {
 	// Account we import to
 	internalAccount := suite.createTestAccount(models.AccountCreate{BudgetID: budget.Data.ID, Name: "Envelope Zero Account"})
 
+	// Test envelope and  test transaction to the Edeka account with an envelope to test the envelope prefill
+	envelope := suite.createTestEnvelope(models.EnvelopeCreate{CategoryID: suite.createTestCategory(models.CategoryCreate{BudgetID: budget.Data.ID}).Data.ID})
+	envelopeID := envelope.Data.ID
+	_ = suite.createTestTransaction(models.TransactionCreate{BudgetID: budget.Data.ID, SourceAccountID: internalAccount.Data.ID, DestinationAccountID: edeka.Data.ID, EnvelopeID: &envelopeID, Amount: decimal.NewFromFloat(12.00)})
+
 	tests := []struct {
 		name                  string                        // Name of the test
 		sourceAccountIDs      []uuid.UUID                   // The IDs of the source accounts
 		destinationAccountIDs []uuid.UUID                   // The IDs of the destination accounts
+		envelopeIDs           []*uuid.UUID                  // expected IDs of envelopes
 		preTest               func(*testing.T) [3]uuid.UUID // Function to execute before running tests
 	}{
 		{
 			"Rule for Edeka",
 			[]uuid.UUID{internalAccount.Data.ID, internalAccount.Data.ID, uuid.Nil},
 			[]uuid.UUID{edeka.Data.ID, uuid.Nil, internalAccount.Data.ID},
+			[]*uuid.UUID{&envelopeID, nil, nil},
 			func(t *testing.T) [3]uuid.UUID {
 				edeka := suite.createTestRenameRule(t, models.RenameRuleCreate{
 					Match:     "EDEKA*",
@@ -282,6 +289,7 @@ func (suite *TestSuiteStandard) TestRename() {
 			"Rule for Edeka and DB",
 			[]uuid.UUID{internalAccount.Data.ID, internalAccount.Data.ID, uuid.Nil},
 			[]uuid.UUID{edeka.Data.ID, bahn.Data.ID, internalAccount.Data.ID},
+			[]*uuid.UUID{&envelopeID, nil, nil},
 			func(t *testing.T) [3]uuid.UUID {
 				edeka := suite.createTestRenameRule(t, models.RenameRuleCreate{
 					Match:     "EDEKA*",
@@ -314,6 +322,8 @@ func (suite *TestSuiteStandard) TestRename() {
 				}
 
 				assert.Equal(t, renameRuleIDs[i], transaction.RenameRuleID, "Expected rename rule has match '%s', actual rename rule has match '%s'", renameRuleIDs[i])
+
+				assert.Equal(t, tt.envelopeIDs[i], transaction.Transaction.EnvelopeID, "proposed envelope ID does not match in line %d", line)
 			}
 
 			// Delete rename rules