fix: triggers with metadata (#981)

formancehq · Dec 8, 2023 · bd45537 · bd45537
1 parent 19b6fb5
commit bd45537
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/components/orchestration/internal/triggers/activity.go b/components/orchestration/internal/triggers/activity.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/formancehq/orchestration/internal/workflow"
+	"github.com/formancehq/stack/libs/go-libs/logging"
 	"github.com/formancehq/stack/libs/go-libs/pointer"
 	"github.com/uptrace/bun"
 )
@@ -35,6 +36,10 @@ func (a Activities) ListTriggers(ctx context.Context, request ProcessEventReques
 			}
 		}
 
+		logging.FromContext(ctx).
+			WithField("trigger-id", trigger.ID).
+			Debugf("Checking expr '%s': %v", trigger.Filter, ok)
+
 		if ok {
 			ret = append(ret, trigger)
 		}

diff --git a/components/orchestration/internal/triggers/listener.go b/components/orchestration/internal/triggers/listener.go
@@ -4,8 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/formancehq/stack/libs/go-libs/pointer"
 	"go.temporal.io/api/enums/v1"
+
+	"github.com/formancehq/stack/libs/go-libs/pointer"
 	"go.temporal.io/api/serviceerror"
 
 	"github.com/formancehq/stack/libs/go-libs/logging"
@@ -60,10 +61,6 @@ func handleMessage(logger logging.Logger, temporalClient client.Client, taskQueu
 	if err != nil {
 		return err
 	}
-	// todo: debug
-	if event.Type != "SAVED_PAYMENT" {
-		return nil
-	}
 
 	logger = logger.WithField("type", event.Type)
 

diff --git a/components/payments/internal/app/messages/payments.go b/components/payments/internal/app/messages/payments.go
@@ -19,8 +19,9 @@ type paymentMessagePayload struct {
 	Asset     models.Asset         `json:"asset"`
 
 	// TODO: Remove 'initialAmount' once frontend has switched to 'amount
-	InitialAmount *big.Int `json:"initialAmount"`
-	Amount        *big.Int `json:"amount"`
+	InitialAmount *big.Int          `json:"initialAmount"`
+	Amount        *big.Int          `json:"amount"`
+	Metadata      map[string]string `json:"metadata"`
 }
 
 func NewEventSavedPayments(payment *models.Payment, provider models.ConnectorProvider) events.EventMessage {
@@ -35,6 +36,13 @@ func NewEventSavedPayments(payment *models.Payment, provider models.ConnectorPro
 		CreatedAt:     payment.CreatedAt,
 		Amount:        payment.Amount,
 		Provider:      provider.String(),
+		Metadata: func() map[string]string {
+			ret := make(map[string]string)
+			for _, m := range payment.Metadata {
+				ret[m.Key] = m.Value
+			}
+			return ret
+		}(),
 	}
 
 	return events.EventMessage{