fix: allow transactions to be updated without an Envelope (#286)

This adds the changes made to transaction creation in #273 to
the logic for transaction updates, too.

Author: morremeyer

pkg/controllers/transaction.go

@@ -164,8 +164,7 @@ func CreateTransaction(c *gin.Context) {
 		return
 	}
 
-	// Check the envelope ID only if it is set. (This will always evaluate to true for incoming and outgoing transactions,
-	// but for transfers, can evaluate to false
+	// Check the envelope ID only if it is set.
 	if transaction.EnvelopeID != nil {
 		_, err = getEnvelopeResource(c, *transaction.EnvelopeID)
 		if err != nil {
@@ -309,7 +308,7 @@ func UpdateTransaction(c *gin.Context) {
 	if data.SourceAccountID != uuid.Nil {
 		sourceAccountID = data.SourceAccountID
 	}
-	sourceAccount, err := getAccountResource(c, sourceAccountID)
+	_, err = getAccountResource(c, sourceAccountID)
 	if err != nil {
 		return
 	}
@@ -319,17 +318,17 @@ func UpdateTransaction(c *gin.Context) {
 	if data.DestinationAccountID != uuid.Nil {
 		destinationAccountID = data.DestinationAccountID
 	}
-	destinationAccount, err := getAccountResource(c, destinationAccountID)
+	_, err = getAccountResource(c, destinationAccountID)
 	if err != nil {
 		return
 	}
 
-	// Check if the transaction is a transfer. If yes, the envelope can be empty.
-	//
-	// Check that the Envelope ID is set for incoming and outgoing transactions
-	if sourceAccount.External || destinationAccount.External && data.EnvelopeID == nil {
-		httputil.NewError(c, http.StatusBadRequest, errors.New("For incoming and outgoing transactions, an envelope is required"))
-		return
+	// Check the envelope ID only if it is set.
+	if data.EnvelopeID != nil {
+		_, err = getEnvelopeResource(c, *data.EnvelopeID)
+		if err != nil {
+			return
+		}
 	}
 
 	err = database.DB.Model(&transaction).Select("", updateFields...).Updates(data).Error

pkg/controllers/transaction_test.go

@@ -432,10 +432,39 @@ func (suite *TestSuiteEnv) TestUpdateNoEnvelopeTransactionOutgoing() {
 	transaction := createTestTransaction(suite.T(), c)
 
 	recorder := test.Request(suite.T(), http.MethodPatch, transaction.Data.Links.Self, `{ "envelopeId": null }`)
-	test.AssertHTTPStatus(suite.T(), http.StatusBadRequest, &recorder)
+	test.AssertHTTPStatus(suite.T(), http.StatusOK, &recorder)
+}
+
+func (suite *TestSuiteEnv) TestUpdateEnvelopeTransactionOutgoing() {
+	envelope := createTestEnvelope(suite.T(), models.EnvelopeCreate{})
 
-	err := test.DecodeError(suite.T(), recorder.Body.Bytes())
-	assert.Equal(suite.T(), "For incoming and outgoing transactions, an envelope is required", err, "request id %s", recorder.Header().Get("x-request-id"))
+	c := models.TransactionCreate{
+		BudgetID:             createTestBudget(suite.T(), models.BudgetCreate{Name: "Testing budget for updating of outgoing transfer"}).Data.ID,
+		SourceAccountID:      createTestAccount(suite.T(), models.AccountCreate{Name: "Internal Source Account", External: false}).Data.ID,
+		DestinationAccountID: createTestAccount(suite.T(), models.AccountCreate{Name: "External destination account", External: true}).Data.ID,
+		EnvelopeID:           &envelope.Data.ID,
+		Amount:               decimal.NewFromFloat(984.13),
+	}
+
+	transaction := createTestTransaction(suite.T(), c)
+	recorder := test.Request(suite.T(), http.MethodPatch, transaction.Data.Links.Self, fmt.Sprintf("{ \"envelopeId\": \"%s\" }", &envelope.Data.ID))
+	test.AssertHTTPStatus(suite.T(), http.StatusOK, &recorder)
+}
+
+func (suite *TestSuiteEnv) TestUpdateNonExistingEnvelopeTransactionOutgoing() {
+	envelope := createTestEnvelope(suite.T(), models.EnvelopeCreate{})
+
+	c := models.TransactionCreate{
+		BudgetID:             createTestBudget(suite.T(), models.BudgetCreate{Name: "Testing budget for updating of outgoing transfer"}).Data.ID,
+		SourceAccountID:      createTestAccount(suite.T(), models.AccountCreate{Name: "Internal Source Account", External: false}).Data.ID,
+		DestinationAccountID: createTestAccount(suite.T(), models.AccountCreate{Name: "External destination account", External: true}).Data.ID,
+		EnvelopeID:           &envelope.Data.ID,
+		Amount:               decimal.NewFromFloat(984.13),
+	}
+
+	transaction := createTestTransaction(suite.T(), c)
+	recorder := test.Request(suite.T(), http.MethodPatch, transaction.Data.Links.Self, `{ "envelopeId": "e6fa8eb5-5f2c-4292-8ef9-02f0c2af1ce4" }`)
+	test.AssertHTTPStatus(suite.T(), http.StatusNotFound, &recorder)
 }
 
 func (suite *TestSuiteEnv) TestUpdateNonExistingTransaction() {