Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/controller/ledger/controller_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ func (ctrl *DefaultController) revertTransaction(ctx context.Context, store Stor
} else {
reversedTx = reversedTx.WithTimestamp(*originalTransaction.RevertedAt)
}
reversedTx.Metadata = ledger.MarkReverts(metadata.Metadata{}, *originalTransaction.ID)

// Check balances after the revert, all balances must be greater than 0
if !parameters.Input.Force {
Expand Down
4 changes: 3 additions & 1 deletion internal/controller/ledger/controller_default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ func TestRevertTransaction(t *testing.T) {
Commit().
Return(nil)

txToRevert := ledger.Transaction{}
txToRevert := ledger.Transaction{
ID: pointer.For(0),
}
store.EXPECT().
RevertTransaction(gomock.Any(), 1, time.Time{}).
DoAndReturn(func(_ context.Context, _ int, _ time.Time) (*ledger.Transaction, bool, error) {
Expand Down
30 changes: 30 additions & 0 deletions internal/metadata.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
package ledger

import (
"fmt"
"github.com/formancehq/go-libs/v2/metadata"
)

const (
formanceNamespace = "com.formance.spec/"
revertKey = "state/reverts"

MetaTargetTypeAccount = "ACCOUNT"
MetaTargetTypeTransaction = "TRANSACTION"
)

func SpecMetadata(name string) string {
return formanceNamespace + name
}

func MarkReverts(m metadata.Metadata, txID int) metadata.Metadata {
return m.Merge(RevertMetadata(txID))
}

func RevertMetadataSpecKey() string {
return SpecMetadata(revertKey)
}

func ComputeMetadata(key, value string) metadata.Metadata {
return metadata.Metadata{
key: value,
}
}

func RevertMetadata(txID int) metadata.Metadata {
return ComputeMetadata(RevertMetadataSpecKey(), fmt.Sprint(txID))
}
18 changes: 17 additions & 1 deletion test/e2e/api_transactions_revert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ var _ = Context("Ledger revert transactions API tests", func() {
})
})
When("reverting it", func() {
var newTransaction *components.V2Transaction
BeforeEach(func() {
_, err := RevertTransaction(
newTransaction, err = RevertTransaction(
ctx,
testServer.GetValue(),
operations.V2RevertTransactionRequest{
Expand All @@ -151,6 +152,21 @@ var _ = Context("Ledger revert transactions API tests", func() {
Expect(err).NotTo(HaveOccurred())

Expect(response.Reverted).To(BeTrue())

By("The newly created transaction should have correct metadata applied", func() {
response, err := GetTransaction(
ctx,
testServer.GetValue(),
operations.V2GetTransactionRequest{
Ledger: "default",
ID: newTransaction.ID,
},
)
Expect(err).NotTo(HaveOccurred())
Expect(response.Metadata).To(Equal(map[string]string{
"com.formance.spec/state/reverts": tx.ID.String(),
}))
})
})
When("trying to revert again", func() {
It("should be rejected", func() {
Expand Down