fix: budget balance not double the actual balance anymore

Author: morremeyer

pkg/controllers/budget.go

@@ -616,7 +616,7 @@ func getBudgetObject(c *gin.Context, id uuid.UUID) (Budget, error) {
 	}
 
 	return Budget{
-		resource.WithCalculations(),
+		resource,
 		getBudgetLinks(c, resource.ID),
 	}, nil
 }

pkg/controllers/budget_test.go

@@ -637,3 +637,39 @@ func (suite *TestSuiteEnv) TestSetAllocationsMonthFailures() {
 	recorder = test.Request(suite.T(), http.MethodPost, strings.Replace(budgetAllocationsLink, "YYYY-MM", "2022-01", 1), `{ "mode": "UNKNOWN_MODE" }`)
 	test.AssertHTTPStatus(suite.T(), http.StatusBadRequest, &recorder)
 }
+
+// TestBudgetBalanceDoubleRegression verifies that the Budget balance is only added once.
+func (suite *TestSuiteEnv) TestBudgetBalanceDoubleRegression() {
+	shouldBalance := decimal.NewFromFloat(1000)
+
+	budget := createTestBudget(suite.T(), models.BudgetCreate{Name: "TestBudgetBalanceDoubleRegression"})
+
+	internalAccount := createTestAccount(suite.T(), models.AccountCreate{
+		BudgetID: budget.Data.ID,
+		OnBudget: true,
+		External: false,
+	})
+
+	externalAccount := createTestAccount(suite.T(), models.AccountCreate{
+		BudgetID: budget.Data.ID,
+		OnBudget: true,
+		External: true,
+	})
+
+	category := createTestCategory(suite.T(), models.CategoryCreate{BudgetID: budget.Data.ID})
+	envelope := createTestEnvelope(suite.T(), models.EnvelopeCreate{CategoryID: category.Data.ID})
+
+	_ = createTestTransaction(suite.T(), models.TransactionCreate{
+		BudgetID:             budget.Data.ID,
+		Amount:               shouldBalance,
+		SourceAccountID:      externalAccount.Data.ID,
+		DestinationAccountID: internalAccount.Data.ID,
+		EnvelopeID:           &envelope.Data.ID,
+	})
+
+	var budgetResponse controllers.BudgetResponse
+	recorder := test.Request(suite.T(), http.MethodGet, budget.Data.Links.Self, "")
+	test.DecodeResponse(suite.T(), &recorder, &budgetResponse)
+
+	assert.True(suite.T(), budgetResponse.Data.Balance.Equal(shouldBalance), "Balance is %s, should be %s", budgetResponse.Data.Balance, shouldBalance)
+}

pkg/models/budget.go

@@ -36,6 +36,8 @@ type BudgetMonth struct {
 
 // WithCalculations computes all the calculated values.
 func (b Budget) WithCalculations() Budget {
+	b.Balance = decimal.Zero
+
 	// Get all OnBudget accounts for the budget
 	var accounts []Account
 	_ = database.DB.Where(&Account{
@@ -47,7 +49,6 @@ func (b Budget) WithCalculations() Budget {
 
 	// Add all their balances to the budget's balance
 	for _, account := range accounts {
-		fmt.Println(account.WithCalculations().Balance)
 		b.Balance = b.Balance.Add(account.WithCalculations().Balance)
 	}