Ability to add or propose transactions

app/bot/bot.go

@@ -197,5 +197,5 @@ func (bot *Bot) proposeTransaction(ctx *ext.Context) (string, *gotgbot.SendMessa
 		return fmt.Sprintf("Error: %v", err), nil, nil
 	}
 
-	return fmt.Sprintf("```\n%s\n```", transaction), &gotgbot.SendMessageOpts{ParseMode: "MarkdownV2"}, nil
+	return transaction, &gotgbot.SendMessageOpts{ParseMode: "MarkdownV2"}, nil
 }

app/ledger/ledger.go

@@ -166,37 +166,46 @@ func (l *Ledger) Execute(args ...string) (string, error) {
 	return l.execute(args...)
 }
 
-func (l *Ledger) AddTransaction(transaction string) error {
-	err := l.repo.Init()
-	defer l.repo.Free()
+func (l *Ledger) addTransaction(transaction string) error {
+	balBefore, err := l.execute("balance")
 	if err != nil {
-		return fmt.Errorf("unable to init repo: %v", err)
+		return fmt.Errorf("invalid transaction: %v", err)
 	}
 
+	balAfter, err := l.executeWith(transaction, "balance")
 
-	balBefore, err := l.execute("balance")
 	if err != nil {
-		return err
+		return fmt.Errorf("invalid transaction: %v", err)
+	}
+
+	if balBefore == balAfter {
+		return fmt.Errorf("invalid transaction: transaction doesn't change balance")
 	}
+
 	r, err := l.repo.OpenForAppend(l.mainFile)
 	if err != nil {
 		return fmt.Errorf("unable to open main ledger file: %v", err)
 	}
 	_, err = fmt.Fprintf(r, "\n%s\n", transaction)
-	r.Close()
+	defer r.Close()
 	if err != nil {
 		return fmt.Errorf("unable to write main ledger file: %v", err)
 	}
-	balAfter, err :=l.execute("balance")
 	if err != nil {
 		return err
 	}
-	if balBefore == balAfter {
-		return fmt.Errorf("transaction doesn't change balance")
-	}
 	return nil
 }
 
+func (l *Ledger) AddTransaction(transaction string) error {
+	err := l.repo.Init()
+	defer l.repo.Free()
+	if err != nil {
+		return fmt.Errorf("unable to init repo: %v", err)
+	}
+	return l.addTransaction(transaction)
+}
+
 func (l *Ledger) validate() error {
 	_, err := l.execute("balance")
 	return err
@@ -343,8 +352,6 @@ func (b OpenAITransactionGenerator) GenerateTransaction(promptCtx PromptCtx) (Tr
 		return Transaction{}, fmt.Errorf("chatCompletion error: %v", err)
 	}
 
-	fmt.Println(resp.Choices[0].Message.Content)
-
 	res := Transaction{}
 	err = json.Unmarshal([]byte(resp.Choices[0].Message.Content), &res)
 	if err != nil {
@@ -466,8 +473,6 @@ func (l *Ledger) proposeTransaction(userInput string) (Transaction, error) {
 		return trx, fmt.Errorf("unable to generate transaction: %v", err)
 	}
 
-	fmt.Println(trx.Format(true))
-
 	err = l.validateWith(trx.Format(true))
 	if err != nil {
 		return trx, fmt.Errorf("unable to validate transaction: %v", err)
@@ -477,15 +482,28 @@ func (l *Ledger) proposeTransaction(userInput string) (Transaction, error) {
 
 }
 
-func (l *Ledger) ProposeTransaction(userInput string, attempts int) (tr Transaction,err error) {
-	if attempts <= 0 {
-		panic("times should be greater than 0")
-	}
+func (l *Ledger) AddOrProposeTransaction(userInput string, attempts int) (wasGenerated bool, tr Transaction,err error) {
+	wasGenerated = false
 	err = l.repo.Init()
 	defer l.repo.Free()
-
 	if err != nil {
-		return tr, err
+		return wasGenerated, tr, err
+	}
+
+	// first try to add userInput as transaction
+	err = l.addTransaction(userInput)
+	if err == nil {
+		return wasGenerated, tr, nil
+	}
+
+	if !strings.HasPrefix(err.Error(), "invalid transaction:") {
+		return wasGenerated, tr, err
+	}
+
+	// after this generate a transaction using LLM
+	wasGenerated = true
+	if attempts <= 0 {
+		panic("times should be greater than 0")
 	}
 
 	for i := 0; i < attempts; i++ {
@@ -494,11 +512,11 @@ func (l *Ledger) ProposeTransaction(userInput string, attempts int) (tr Transact
 		}
 		tr, err = l.proposeTransaction(userInput)
 		if err == nil {
-			return tr, nil
+			return wasGenerated, tr, nil
 		}
 	}
 
-	return tr, err
+	return wasGenerated, tr, err
 }
 
 

app/ledger/ledger_test.go

@@ -241,7 +241,9 @@ account Equity
 	t.Run("happy path", func(t *testing.T) {
 
 
-		tr, err := ledger.ProposeTransaction("20 Taco Bell", 5)
+		wasGenerated, tr, err := ledger.AddOrProposeTransaction("20 Taco Bell", 5)
+
+		assert.True(t, wasGenerated)
 
 		assert.NoError(t, err)
 
@@ -282,10 +284,25 @@ account Equity
 		)
 	})
 
+	t.Run("add an already valid transaction", func(t *testing.T) {
+		mockedTransactionGenerator.ResetCalls()
+
+		wasGenerated, _, err := ledger.AddOrProposeTransaction(`
+2014-11-12 * Tacos
+    Assets:Cash  -2,43 EUR
+    Food  2,43 EUR
+`, 1)
+
+		assert.False(t, wasGenerated)
+		assert.NoError(t, err)
+		assert.Equal(t, 0, len(mockedTransactionGenerator.calls.GenerateTransaction))
+
+	})
+
 	t.Run("validation error path", func(t *testing.T) {
 		mockedTransactionGenerator.ResetCalls()
 
-		_, err := ledger.ProposeTransaction("20 Taco Bell", 1)
+		_, _, err := ledger.AddOrProposeTransaction("20 Taco Bell", 1)
 
 		assert.ErrorContains(t, err, "Unknown account 'cash'")
 

app/teledger/teledger.go

@@ -53,17 +53,42 @@ func (tel *Teledger) Balance() (string, error) {
 }
 
 
+func inBacktick(s string) string {
+	return fmt.Sprintf("```\n%s\n```", s)
+}
+
 // Receive a short free-text description of a transaction
 // and propose a formatted transaction validated with the
 // ledger file.
 // Store the transaction in a state, so the user can confirm
 // or reject it.
 func (tel *Teledger) ProposeTransaction(desc string) (string, error) {
+	wasGenerated, tr, err := tel.ledger.AddOrProposeTransaction(desc, 2)
+	if wasGenerated {
+		if err == nil {
+			return fmt.Sprintf(`Proposed valid transaction:
+%s
+`,
+				inBacktick(tr.Format(false)),
+			), nil
+		} else {
+			if len(tr.Postings) > 0 {
+				return fmt.Sprintf(`Proposed but invalid transaction:
+%s`,
+					inBacktick(tr.Format(false)),
+				), nil
+			} else {
+				return "", err
+			}
 
-	tr, err := tel.ledger.ProposeTransaction(desc, 2)
-	if err != nil {
-		return "", err
-	}
+		}
+
+	} else {
+		if err == nil {
+			return "Transaction Added", nil
+		} else {
+			return "", err
+		}
 
-	return tr.Format(true), nil
+	}
 }