fix: overspent now adds transactions without envelope

Author: morremeyer

pkg/models/budget.go

@@ -148,6 +148,10 @@ func (b Budget) TotalBudgeted(month time.Time) (decimal.Decimal, error) {
 
 // Overspent calculates overspend for a specific month.
 func (b Budget) Overspent(month time.Time) (decimal.Decimal, error) {
+	// Only use the year and month values, everything else is reset to the start
+	// Add a month to also factor in all allocations in the requested month
+	month = time.Date(month.Year(), month.Month(), 1, 0, 0, 0, 0, time.UTC)
+
 	var envelopes []Envelope
 	err := database.DB.
 		Joins("Category", database.DB.Where(&Category{CategoryCreate: CategoryCreate{BudgetID: b.ID}})).
@@ -165,5 +169,30 @@ func (b Budget) Overspent(month time.Time) (decimal.Decimal, error) {
 		}
 	}
 
+	var noEnvelopeSum decimal.NullDecimal
+	err = database.DB.
+		Select("SUM(amount)").
+		Joins("JOIN accounts source_account ON transactions.source_account_id = source_account.id AND source_account.deleted_at IS NULL").
+		Joins("JOIN accounts destination_account ON transactions.destination_account_id = destination_account.id AND destination_account.deleted_at IS NULL").
+		Where("source_account.external = 0").
+		Where("destination_account.external = 1").
+		Where("transactions.envelope_id IS NULL").
+		Where("transactions.date < date(?) ", month.AddDate(0, 1, 0)).
+		Where(&Transaction{
+			TransactionCreate: TransactionCreate{
+				BudgetID: b.ID,
+			},
+		}).
+		Table("transactions").
+		Find(&noEnvelopeSum).
+		Error
+	if err != nil {
+		return decimal.Zero, err
+	}
+
+	if noEnvelopeSum.Valid {
+		overspent = overspent.Add(noEnvelopeSum.Decimal)
+	}
+
 	return overspent, nil
 }

pkg/models/budget_test.go

@@ -200,9 +200,23 @@ func (suite *TestSuiteEnv) TestBudgetCalculations() {
 		suite.Assert().Fail("Resource could not be saved", err)
 	}
 
+	overspendTransaction := models.Transaction{
+		TransactionCreate: models.TransactionCreate{
+			Date:                 marchFifteenthTwentyTwentyTwo,
+			BudgetID:             budget.ID,
+			SourceAccountID:      cashAccount.ID,
+			DestinationAccountID: groceryAccount.ID,
+			Amount:               decimal.NewFromFloat(20),
+		},
+	}
+	err = database.DB.Save(&overspendTransaction).Error
+	if err != nil {
+		suite.Assert().Fail("Resource could not be saved", err)
+	}
+
 	budget = budget.WithCalculations()
 
-	shouldBalance := decimal.NewFromFloat(5489.38)
+	shouldBalance := decimal.NewFromFloat(5469.38)
 	assert.True(suite.T(), budget.Balance.Equal(shouldBalance), "Balance for budget is not correct. Should be %s, is %s", shouldBalance, budget.Balance)
 
 	// Verify income for used budget in March
@@ -238,14 +252,14 @@ func (suite *TestSuiteEnv) TestBudgetCalculations() {
 	assert.True(suite.T(), budgeted.IsZero(), "Budgeted is %s, should be 0", budgeted)
 
 	// Verify overspent calculation for month without spend
-	overpent, err := budget.Overspent(time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC))
+	overspent, err := budget.Overspent(time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC))
 	assert.Nil(suite.T(), err)
-	assert.True(suite.T(), overpent.IsZero(), "Overspent is %s, should be 0", overpent)
+	assert.True(suite.T(), overspent.IsZero(), "Overspent is %s, should be 0", overspent)
 
 	// Verify overspent calculation for month with spend
-	overpent, err = budget.Overspent(marchFifteenthTwentyTwentyTwo)
+	overspent, err = budget.Overspent(marchFifteenthTwentyTwentyTwo)
 	assert.Nil(suite.T(), err)
-	assert.True(suite.T(), overpent.Equal(decimal.NewFromFloat(110.62)), "Overspent is %s, should be 110.62", overpent)
+	assert.True(suite.T(), overspent.Equal(decimal.NewFromFloat(130.62)), "Overspent is %s, should be 130.62", overspent)
 }
 
 func (suite *TestSuiteEnv) TestMonthIncomeNoTransactions() {