Merge pull request #1410 from openmeterio/feat/event-filtering

feat: add filtering by rule and channel
openmeterio · Aug 22, 2024 · 1244af9 · 1244af9
2 parents cfa5260 + 9854c59
commit 1244af9
Show file tree

Hide file tree

Showing 6 changed files with 695 additions and 590 deletions.
diff --git a/api/api.gen.go b/api/api.gen.go
diff --git a/api/client/go/client.gen.go b/api/client/go/client.gen.go
diff --git a/api/openapi.yaml b/api/openapi.yaml
@@ -1656,6 +1656,28 @@ paths:
         - $ref: "#/components/parameters/queryTo"
         - $ref: "#/components/parameters/queryFilterFeature"
         - $ref: "#/components/parameters/queryFilterSubject"
+        - name: rule
+          description: |
+            Filtering by multiple rules.
+
+            Usage: `?rule=ID1&rule=rule=ID2`
+          in: query
+          required: false
+          schema:
+            type: array
+            items:
+              type: string
+        - name: channel
+          description: |
+            Filtering by multiple channels.
+
+            Usage: `?channel=ID1&channel=ID2`
+          in: query
+          required: false
+          schema:
+            type: array
+            items:
+              type: string
       responses:
         "200":
           description: List of notification events.

diff --git a/internal/notification/event.go b/internal/notification/event.go
@@ -235,6 +235,9 @@ type ListEventsInput struct {
 	Subjects []string `json:"subjects,omitempty"`
 	Features []string `json:"features,omitempty"`
 
+	Rules    []string `json:"rules,omitempty"`
+	Channels []string `json:"channels,omitempty"`
+
 	DeduplicationHashes []string `json:"deduplicationHashes,omitempty"`
 
 	DeliveryStatusStates []EventDeliveryStatusState `json:"deliveryStatusStates,omitempty"`

diff --git a/internal/notification/httpdriver/event.go b/internal/notification/httpdriver/event.go
@@ -39,6 +39,8 @@ func (h *handler) ListEvents() ListEventsHandler {
 				},
 				Subjects: defaultx.WithDefault(params.Subject, nil),
 				Features: defaultx.WithDefault(params.Feature, nil),
+				Rules:    defaultx.WithDefault(params.Rule, nil),
+				Channels: defaultx.WithDefault(params.Channel, nil),
 				From:     defaultx.WithDefault(params.From, time.Time{}),
 				To:       defaultx.WithDefault(params.To, time.Time{}),
 			}

diff --git a/internal/notification/repository/repository.go b/internal/notification/repository/repository.go
@@ -519,6 +519,14 @@ func (r repository) ListEvents(ctx context.Context, params notification.ListEven
 		)
 	}
 
+	if len(params.Rules) > 0 {
+		query = query.Where(eventdb.RuleIDIn(params.Rules...))
+	}
+
+	if len(params.Channels) > 0 {
+		query = query.Where(eventdb.HasRulesWith(ruledb.HasChannelsWith(channeldb.IDIn(params.Channels...))))
+	}
+
 	query = query.WithRules(func(query *entdb.NotificationRuleQuery) {
 		query.WithChannels()
 	})