fix: rule processing (#89)

Author: skynet2

pkg/transactions/base_amount_test.go

@@ -73,6 +73,12 @@ func TestBaseAmountService(t *testing.T) {
 				Type:     gomoneypbv1.AccountType_ACCOUNT_TYPE_EXPENSE,
 				Currency: "RAND",
 			},
+			{
+				Name:     "Default Income",
+				Extra:    map[string]string{},
+				Type:     gomoneypbv1.AccountType_ACCOUNT_TYPE_INCOME,
+				Currency: baseCurrency,
+			},
 		}
 		assert.NoError(t, gormDB.Create(&acc).Error)
 
@@ -237,6 +243,17 @@ func TestBaseAmountService(t *testing.T) {
 				// source base
 				// dest different
 			},
+			{
+				TransactionType: gomoneypbv1.TransactionType_TRANSACTION_TYPE_INCOME,
+				SourceCurrency:  baseCurrency,
+				SourceAmount:    decimal.NewNullDecimal(decimal.NewFromInt(1000)),
+				SourceAccountID: acc[6].ID,
+
+				DestinationCurrency:  baseCurrency,
+				DestinationAccountID: acc[1].ID,
+				DestinationAmount:    decimal.NewNullDecimal(decimal.NewFromInt(1000)),
+				Extra:                make(map[string]string),
+			},
 		}
 
 		txSrv := validation.NewValidationService(&validation.ServiceConfig{})
@@ -289,6 +306,9 @@ func TestBaseAmountService(t *testing.T) {
 
 		assert.EqualValues(t, -55, updatedTxs[9].SourceAmountInBaseCurrency.Decimal.IntPart())
 		assert.EqualValues(t, 55, updatedTxs[9].DestinationAmountInBaseCurrency.Decimal.IntPart())
+
+		assert.EqualValues(t, 1000, updatedTxs[10].DestinationAmountInBaseCurrency.Decimal.IntPart())
+		assert.EqualValues(t, -1000, updatedTxs[10].SourceAmountInBaseCurrency.Decimal.IntPart())
 	})
 
 	t.Run("success with partial update", func(t *testing.T) {

pkg/transactions/integration_test.go

@@ -321,6 +321,75 @@ func TestUpdateTransaction(t *testing.T) {
 	assert.EqualValues(t, "-20.5", updatedAccounts[1].CurrentBalance.String())
 }
 
+func TestBasicIncome(t *testing.T) {
+	assert.NoError(t, testingutils.FlushAllTables(cfg.Db))
+
+	statsSvc := transactions.NewStatService()
+	mapper := NewMockMapperSvc(gomock.NewController(t))
+
+	mapper.EXPECT().MapTransaction(gomock.Any(), gomock.Any()).
+		Return(&gomoneypbv1.Transaction{})
+
+	ruleEngine := NewMockRuleSvc(gomock.NewController(t))
+	ruleEngine.EXPECT().ProcessTransactions(gomock.Any(), gomock.Any()).
+		DoAndReturn(func(ctx context.Context, i []*database.Transaction) ([]*database.Transaction, error) {
+			assert.Len(t, i, 1)
+			return i, nil
+		})
+
+	baseCurrency := transactions.NewBaseAmountService("USD")
+	accountSvc := NewMockAccountSvc(gomock.NewController(t))
+	validationSvc := NewMockValidationSvc(gomock.NewController(t))
+	doubleEntry := NewMockDoubleEntrySvc(gomock.NewController(t))
+
+	srv := transactions.NewService(&transactions.ServiceConfig{
+		StatsSvc:          statsSvc,
+		MapperSvc:         mapper,
+		BaseAmountService: baseCurrency,
+		RuleSvc:           ruleEngine,
+		AccountSvc:        accountSvc,
+		ValidationSvc:     validationSvc,
+		DoubleEntry:       doubleEntry,
+	})
+
+	accounts := []*database.Account{
+		{
+			Name:     "Asset 1",
+			Currency: "USD",
+			Extra:    map[string]string{},
+		},
+		{
+			Name:     "Income 1",
+			Currency: "USD",
+			Extra:    map[string]string{},
+		},
+	}
+	assert.NoError(t, gormDB.Create(&accounts).Error)
+
+	accountSvc.EXPECT().GetAllAccounts(gomock.Any()).Return(accounts, nil)
+	validationSvc.EXPECT().Validate(gomock.Any(), gomock.Any(), gomock.Any()).
+		Return(nil)
+	doubleEntry.EXPECT().Record(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
+		Return(nil)
+
+	depositDate2 := time.Date(2025, 6, 7, 0, 0, 0, 0, time.UTC)
+	_, err := srv.Create(context.TODO(), &transactionsv1.CreateTransactionRequest{
+		TransactionDate: timestamppb.New(depositDate2),
+		Transaction: &transactionsv1.CreateTransactionRequest_Income{
+			Income: &transactionsv1.Income{
+				DestinationAmount:    "100",
+				DestinationCurrency:  "USD",
+				DestinationAccountId: accounts[0].ID,
+
+				SourceAmount:    "-100",
+				SourceCurrency:  "USD",
+				SourceAccountId: accounts[1].ID,
+			},
+		},
+	})
+	assert.NoError(t, err)
+}
+
 func TestBasicCalc(t *testing.T) {
 	assert.NoError(t, testingutils.FlushAllTables(cfg.Db))
 

pkg/transactions/service.go

@@ -321,9 +321,6 @@ func (s *Service) CreateBulkInternal(
 
 	var originalTxs []*database.Transaction
 
-	var toCreate []*database.Transaction
-	var toUpdate []*database.Transaction
-
 	for _, req := range reqs {
 		if req.OriginalTx != nil { // save list of original transactions for update
 			originalTxs = append(originalTxs, req.OriginalTx)
@@ -340,12 +337,6 @@ func (s *Service) CreateBulkInternal(
 
 		// validate wallet transaction date
 
-		if req.OriginalTx == nil {
-			toCreate = append(toCreate, newTx)
-		} else {
-			toUpdate = append(toUpdate, newTx)
-		}
-
 		if req.Req.SkipRules {
 			transactionWithoutRules = append(transactionWithoutRules, newTx)
 		} else {
@@ -362,6 +353,17 @@ func (s *Service) CreateBulkInternal(
 		transactionWithRules = modifiedTxs
 	}
 
+	var toCreate []*database.Transaction
+	var toUpdate []*database.Transaction
+
+	for _, newTx := range append(transactionWithRules, transactionWithoutRules...) {
+		if newTx.ID == 0 {
+			toCreate = append(toCreate, newTx)
+		} else {
+			toUpdate = append(toUpdate, newTx)
+		}
+	}
+
 	zerolog.Ctx(ctx).Info().
 		Int("to_create", len(toCreate)).
 		Int("to_update", len(toUpdate)).