fix: do not add deleted transactions to account sum (#251)

Author: morremeyer

pkg/models/account.go

@@ -91,12 +91,14 @@ func TransactionsSum(incoming, outgoing Transaction) decimal.Decimal {
 
 	_ = database.DB.Table("transactions").
 		Where(&outgoing).
+		Where("deleted_at is NULL").
 		Select("SUM(amount)").
 		Row().
 		Scan(&outgoingSum)
 
 	_ = database.DB.Table("transactions").
 		Where(&incoming).
+		Where("deleted_at is NULL").
 		Select("SUM(amount)").
 		Row().
 		Scan(&incomingSum)

pkg/models/account_test.go

@@ -91,6 +91,15 @@ func (suite *TestSuiteEnv) TestAccountCalculations() {
 	assert.True(suite.T(), a.Balance.Equal(incomingTransaction.Amount.Sub(outgoingTransaction.Amount)), "Balance for account is not correct. Should be: %v but is %v", incomingTransaction.Amount.Sub(outgoingTransaction.Amount), a.Balance)
 
 	assert.True(suite.T(), a.ReconciledBalance.Equal(incomingTransaction.Amount), "Reconciled balance for account is not correct. Should be: %v but is %v", incomingTransaction.Amount, a.ReconciledBalance)
+
+	err = database.DB.Delete(&incomingTransaction).Error
+	if err != nil {
+		suite.Assert().Fail("Resource could not be deleted", err)
+	}
+
+	a = account.WithCalculations()
+	assert.True(suite.T(), a.Balance.Equal(outgoingTransaction.Amount.Neg()), "Balance for account is not correct. Should be: %v but is %v", outgoingTransaction.Amount.Neg(), a.Balance)
+	assert.True(suite.T(), a.ReconciledBalance.Equal(decimal.NewFromFloat(0)), "Reconciled balance for account is not correct. Should be: %v but is %v", decimal.NewFromFloat(0), a.ReconciledBalance)
 }
 
 func (suite *TestSuiteEnv) TestAccountTransactions() {

pkg/models/envelope_test.go

@@ -96,4 +96,12 @@ func (suite *TestSuiteEnv) TestEnvelopeMonthSum() {
 
 	envelopeMonth = envelope.Month(time.Date(2022, 2, 1, 0, 0, 0, 0, time.UTC))
 	assert.True(suite.T(), envelopeMonth.Spent.Equal(spent.Neg()), "Month calculation for 2022-02 is wrong: should be %v, but is %v", spent, envelopeMonth.Spent)
+
+	err = database.DB.Delete(&transaction).Error
+	if err != nil {
+		suite.Assert().Fail("Resource could not be deleted", err)
+	}
+
+	envelopeMonth = envelope.Month(time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC))
+	assert.True(suite.T(), envelopeMonth.Spent.Equal(decimal.NewFromFloat(0)), "Month calculation for 2022-01 is wrong: should be %v, but is %v", decimal.NewFromFloat(0), envelopeMonth.Spent)
 }