Merge pull request #1375 from openmeterio/notification-api

fix: Notification API in backend
openmeterio · Aug 15, 2024 · fbf29c2 · fbf29c2
2 parents 75649ca + 49a9dd4
commit fbf29c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -409,6 +409,7 @@ func main() {
 			Notification:                notificationService,
 			// modules
 			EntitlementsEnabled: conf.Entitlements.Enabled,
+			NotificationEnabled: conf.Notification.Enabled,
 		},
 		RouterHook: func(r chi.Router) {
 			r.Use(func(h http.Handler) http.Handler {

diff --git a/internal/notification/eventhandler.go b/internal/notification/eventhandler.go
@@ -156,7 +156,7 @@ func (h *handler) dispatchWebhook(ctx context.Context, event *Event) error {
 		Namespace: event.Namespace,
 		EventID:   event.ID,
 		EventType: string(event.Type),
-		Channels:  channelIDs,
+		Channels:  []string{event.Rule.ID},
 	}
 
 	switch event.Type {

diff --git a/internal/notification/service.go b/internal/notification/service.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/openmeterio/openmeter/internal/notification/webhook"
 	"github.com/openmeterio/openmeter/internal/productcatalog"
+	"github.com/openmeterio/openmeter/pkg/models"
 )
 
 type Service interface {
@@ -406,6 +407,16 @@ func (c service) CreateEvent(ctx context.Context, params CreateEventInput) (*Eve
 	if err != nil {
 		return nil, fmt.Errorf("failed to get rule: %w", err)
 	}
+
+	if rule.DeletedAt != nil {
+		return nil, NotFoundError{
+			NamespacedID: models.NamespacedID{
+				Namespace: params.Namespace,
+				ID:        params.RuleID,
+			},
+		}
+	}
+
 	if rule.Disabled {
 		return nil, ValidationError{
 			Err: errors.New("failed to send event: rule is disabled"),