Skip to content

Commit 5d53ae8

Browse files
committed
refactor: remove unused method TotalBudgeted
1 parent a476ab8 commit 5d53ae8

File tree

2 files changed

+1
-70
lines changed

2 files changed

+1
-70
lines changed

pkg/models/budget.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -120,33 +120,6 @@ func (b Budget) Budgeted(db *gorm.DB, month types.Month) (decimal.Decimal, error
120120
return budgeted.Decimal, nil
121121
}
122122

123-
// TotalBudgeted calculates the total sum that has been budgeted before a specific month.
124-
func (b Budget) TotalBudgeted(db *gorm.DB, month types.Month) (decimal.Decimal, error) {
125-
month = month.AddDate(0, 1)
126-
127-
var budgeted decimal.NullDecimal
128-
err := db.
129-
Select("SUM(amount)").
130-
Joins("JOIN envelopes ON allocations.envelope_id = envelopes.id AND envelopes.deleted_at IS NULL").
131-
Joins("JOIN categories ON envelopes.category_id = categories.id AND categories.deleted_at IS NULL").
132-
Joins("JOIN budgets ON categories.budget_id = budgets.id AND budgets.deleted_at IS NULL").
133-
Where("budgets.id = ?", b.ID).
134-
Where("allocations.month < date(?) ", month).
135-
Table("allocations").
136-
Find(&budgeted).
137-
Error
138-
if err != nil {
139-
return decimal.Zero, err
140-
}
141-
142-
// If no transactions are found, the value is nil
143-
if !budgeted.Valid {
144-
return decimal.NewFromFloat(0), nil
145-
}
146-
147-
return budgeted.Decimal, nil
148-
}
149-
150123
type CategoryEnvelopes struct {
151124
ID uuid.UUID `json:"id" example:"dafd9a74-6aeb-46b9-9f5a-cfca624fea85"` // ID of the category
152125
Name string `json:"name" example:"Rainy Day Funds" default:""` // Name of the category

pkg/models/budget_test.go

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -257,26 +257,11 @@ func (suite *TestSuiteStandard) TestBudgetCalculations() {
257257
assert.Nil(suite.T(), err)
258258
assert.True(suite.T(), income.IsZero(), "Income is %s, should be 0", income)
259259

260-
// Verify total budgeted for used budget
261-
budgeted, err := budget.TotalBudgeted(suite.db, marchTwentyTwentyTwo)
262-
assert.Nil(suite.T(), err)
263-
assert.True(suite.T(), budgeted.Equal(decimal.NewFromFloat(67)), "Budgeted is %s, should be 67", budgeted)
264-
265-
// Verify total budgeted for used budget in January after (regression test for using AddDate(0, 1, 0) with the month instead of the whole date)
266-
budgeted, err = budget.TotalBudgeted(suite.db, types.NewMonth(2023, 1))
267-
assert.Nil(suite.T(), err)
268-
assert.True(suite.T(), budgeted.Equal(decimal.NewFromFloat(67)), "Budgeted is %s, should be 67", budgeted)
269-
270260
// Verify budgeted for used budget
271-
budgeted, err = budget.Budgeted(suite.db, marchTwentyTwentyTwo)
261+
budgeted, err := budget.Budgeted(suite.db, marchTwentyTwentyTwo)
272262
assert.Nil(suite.T(), err)
273263
assert.True(suite.T(), budgeted.Equal(decimal.NewFromFloat(25)), "Budgeted is %s, should be 25", budgeted)
274264

275-
// Verify total budgeted for empty budget
276-
budgeted, err = emptyBudget.TotalBudgeted(suite.db, marchTwentyTwentyTwo)
277-
assert.Nil(suite.T(), err)
278-
assert.True(suite.T(), budgeted.IsZero(), "Budgeted is %s, should be 0", budgeted)
279-
280265
// Verify budgeted for empty budget
281266
budgeted, err = emptyBudget.Budgeted(suite.db, marchTwentyTwentyTwo)
282267
assert.Nil(suite.T(), err)
@@ -295,18 +280,6 @@ func (suite *TestSuiteStandard) TestMonthIncomeNoTransactions() {
295280
assert.True(suite.T(), income.IsZero(), "Income is %s, should be 0", income)
296281
}
297282

298-
func (suite *TestSuiteStandard) TestTotalBudgetedNoTransactions() {
299-
budget := models.Budget{}
300-
err := suite.db.Save(&budget).Error
301-
if err != nil {
302-
suite.Assert().Fail("Resource could not be saved", err)
303-
}
304-
305-
budgeted, err := budget.TotalBudgeted(suite.db, types.NewMonth(1913, 8))
306-
assert.Nil(suite.T(), err)
307-
assert.True(suite.T(), budgeted.IsZero(), "Income is %s, should be 0", budgeted)
308-
}
309-
310283
func (suite *TestSuiteStandard) TestBudgetIncomeDBFail() {
311284
budget := models.Budget{}
312285

@@ -337,21 +310,6 @@ func (suite *TestSuiteStandard) TestBudgetBudgetedDBFail() {
337310
suite.Assert().Equal("sql: database is closed", err.Error())
338311
}
339312

340-
func (suite *TestSuiteStandard) TestBudgetTotalBudgetedDBFail() {
341-
budget := models.Budget{}
342-
343-
err := suite.db.Save(&budget).Error
344-
if err != nil {
345-
suite.Assert().Fail("Resource could not be saved", err)
346-
}
347-
348-
suite.CloseDB()
349-
350-
_, err = budget.TotalBudgeted(suite.db, types.NewMonth(2017, 7))
351-
suite.Assert().NotNil(err)
352-
suite.Assert().Equal("sql: database is closed", err.Error())
353-
}
354-
355313
// TestBudgetMonth verifies that the monthly calculations are correct.
356314
func (suite *TestSuiteStandard) TestMonth() {
357315
budget := suite.createTestBudget(models.BudgetCreate{})

0 commit comments

Comments
 (0)