notif data

mtojek · mtojek · commit fcd6d61b4674 · 2024-09-06T11:53:10.000+02:00
diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go
@@ -303,7 +303,8 @@ func (e *Executor) runOnce(t time.Time) Stats {
 							"reason":                   nextBuildReason,
 							"template_version_name":    activeTemplateVersion.Name,
 							"template_version_message": activeTemplateVersion.Message,
-						}, "autobuild",
+						},
+						"autobuild",
 						// Associate this notification with all the related entities.
 						ws.ID, ws.OwnerID, ws.TemplateID, ws.OrganizationID,
 					); err != nil {
diff --git a/coderd/notifications/enqueuer.go b/coderd/notifications/enqueuer.go
@@ -52,9 +52,14 @@ func NewStoreEnqueuer(cfg codersdk.NotificationsConfig, store Store, helpers tem
 	}, nil
 }
 
+// Enqueue queues a notification message for later delivery, assumes no structured input data.
+func (s *StoreEnqueuer) Enqueue(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
+	return s.EnqueueData(ctx, userID, templateID, labels, map[string]any{}, createdBy, targets...)
+}
+
 // Enqueue queues a notification message for later delivery.
 // Messages will be dequeued by a notifier later and dispatched.
-func (s *StoreEnqueuer) Enqueue(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
+func (s *StoreEnqueuer) EnqueueData(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, data map[string]any, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
 	metadata, err := s.store.FetchNewMessageMetadata(ctx, database.FetchNewMessageMetadataParams{
 		UserID:                 userID,
 		NotificationTemplateID: templateID,
@@ -69,7 +74,6 @@ func (s *StoreEnqueuer) Enqueue(ctx context.Context, userID, templateID uuid.UUI
 		dispatchMethod = metadata.CustomMethod.NotificationMethod
 	}
 
-	data := map[string]any{} // FIXME
 	payload, err := s.buildPayload(metadata, labels, data)
 	if err != nil {
 		s.log.Warn(ctx, "failed to build payload", slog.F("template_id", templateID), slog.F("user_id", userID), slog.Error(err))
diff --git a/coderd/notifications/spec.go b/coderd/notifications/spec.go
@@ -33,4 +33,5 @@ type Handler interface {
 // Enqueuer enqueues a new notification message in the store and returns its ID, should it enqueue without failure.
 type Enqueuer interface {
 	Enqueue(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error)
+	EnqueueData(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, data map[string]any, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error)
 }
diff --git a/testutil/notifications.go b/testutil/notifications.go
@@ -15,18 +15,24 @@ type FakeNotificationsEnqueuer struct {
 type Notification struct {
 	UserID, TemplateID uuid.UUID
 	Labels             map[string]string
+	Data               map[string]any
 	CreatedBy          string
 	Targets            []uuid.UUID
 }
 
-func (f *FakeNotificationsEnqueuer) Enqueue(_ context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
+func (f *FakeNotificationsEnqueuer) Enqueue(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
+	return f.EnqueueData(ctx, userID, templateID, labels, map[string]any{}, createdBy, targets...)
+}
+
+func (f *FakeNotificationsEnqueuer) EnqueueData(_ context.Context, userID, templateID uuid.UUID, labels map[string]string, data map[string]any, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 
 	f.Sent = append(f.Sent, &Notification{
 		UserID:     userID,
 		TemplateID: templateID,
 		Labels:     labels,
+		Data:       data,
 		CreatedBy:  createdBy,
 		Targets:    targets,
 	})

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,5 @@ type Handler interface {`
`33`	`33`	`// Enqueuer enqueues a new notification message in the store and returns its ID, should it enqueue without failure.`
`34`	`34`	`type Enqueuer interface {`
`35`	`35`	`Enqueue(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error)`
	`36`	`+ EnqueueData(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, data map[string]any, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error)`
`36`	`37`	`}`