Merge pull request #1405 from openmeterio/fix/notification-issues

fix: issues around balance snapshots
openmeterio · Aug 22, 2024 · 6a7f913 · 6a7f913
2 parents 09c5c34 + 3317bf5
commit 6a7f913
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/internal/entitlement/entitlement.go b/internal/entitlement/entitlement.go
@@ -96,7 +96,7 @@ type Entitlement struct {
 
 	// All none-core fields are optional
 	// metered
-	MeasureUsageFrom        *time.Time `json:"-"`
+	MeasureUsageFrom        *time.Time `json:"measureUsageFrom,omitempty"`
 	IssueAfterReset         *float64   `json:"issueAfterReset,omitempty"`
 	IssueAfterResetPriority *uint8     `json:"issueAfterResetPriority,omitempty"`
 	IsSoftLimit             *bool      `json:"isSoftLimit,omitempty"`

diff --git a/internal/notification/consumer/balancetreshold.go b/internal/notification/consumer/balancetreshold.go
@@ -44,7 +44,7 @@ func (b *BalanceThresholdEventHandler) Handle(ctx context.Context, event snapsho
 
 	// TODO[issue-1364]: this must be cached to prevent going to the DB for each balance.snapshot event
 	affectedRulesPaged, err := b.Notification.ListRules(ctx, notification.ListRulesInput{
-		Namespaces: []string{event.Entitlement.Namespace},
+		Namespaces: []string{event.Namespace.ID},
 		Types:      []notification.RuleType{notification.RuleTypeBalanceThreshold},
 	})
 	if err != nil {
@@ -101,7 +101,7 @@ func (b *BalanceThresholdEventHandler) handleRule(ctx context.Context, balSnapsh
 			PageSize:   1,
 			PageNumber: 1,
 		},
-		Namespaces: []string{balSnapshot.Entitlement.Namespace},
+		Namespaces: []string{balSnapshot.Namespace.ID},
 
 		From: balSnapshot.Entitlement.CurrentUsagePeriod.From,
 		To:   balSnapshot.Entitlement.CurrentUsagePeriod.To,
@@ -185,7 +185,7 @@ func (b *BalanceThresholdEventHandler) createEvent(ctx context.Context, in creat
 
 	_, err = b.Notification.CreateEvent(ctx, notification.CreateEventInput{
 		NamespacedModel: models.NamespacedModel{
-			Namespace: in.Snapshot.Entitlement.Namespace,
+			Namespace: in.Snapshot.Namespace.ID,
 		},
 		Annotations: annotations,
 		Type:        notification.EventTypeBalanceThreshold,

diff --git a/internal/notification/consumer/consumer.go b/internal/notification/consumer/consumer.go
@@ -64,10 +64,11 @@ func New(opts Options) (*Consumer, error) {
 		),
 	)
 
-	return &Consumer{
-		opts:   opts,
-		router: router,
-	}, nil
+	return consumer, nil
+}
+
+func (c *Consumer) Handle(ctx context.Context, event snapshot.SnapshotEvent) error {
+	return c.balanceThresholdHandler.Handle(ctx, event)
 }
 
 func (c *Consumer) Run(ctx context.Context) error {