fixmes

mtojek · mtojek · commit be24cbdc64ac · 2024-09-06T12:01:36.000+02:00
diff --git a/coderd/notifications/enqueuer.go b/coderd/notifications/enqueuer.go
@@ -54,7 +54,8 @@ func NewStoreEnqueuer(cfg codersdk.NotificationsConfig, store Store, helpers tem
 
 // 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...)
+	// "nil" data will be omitted while building the JSON payload.
+	return s.EnqueueData(ctx, userID, templateID, labels, nil, createdBy, targets...)
 }
 
 // Enqueue queues a notification message for later delivery.
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -221,10 +221,10 @@ func (n *notifier) prepare(ctx context.Context, msg database.AcquireNotification
 	}
 
 	var title, body string
-	if title, err = render.GoTemplate(msg.TitleTemplate, payload, nil); err != nil {
+	if title, err = render.GoTemplate(msg.TitleTemplate, payload, nil); err != nil { // FIXME helpers
 		return nil, xerrors.Errorf("render title: %w", err)
 	}
-	if body, err = render.GoTemplate(msg.BodyTemplate, payload, nil); err != nil {
+	if body, err = render.GoTemplate(msg.BodyTemplate, payload, nil); err != nil { // FIXME helpers
 		return nil, xerrors.Errorf("render body: %w", err)
 	}
 
diff --git a/testutil/notifications.go b/testutil/notifications.go
@@ -21,7 +21,7 @@ type Notification struct {
 }
 
 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...)
+	return f.EnqueueData(ctx, userID, templateID, labels, nil, 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) {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ func NewStoreEnqueuer(cfg codersdk.NotificationsConfig, store Store, helpers tem`
`54`	`54`
`55`	`55`	`// Enqueue queues a notification message for later delivery, assumes no structured input data.`
`56`	`56`	`func (s StoreEnqueuer) Enqueue(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (uuid.UUID, error) {`
`57`		`- return s.EnqueueData(ctx, userID, templateID, labels, map[string]any{}, createdBy, targets...)`
	`57`	`+ // "nil" data will be omitted while building the JSON payload.`
	`58`	`+ return s.EnqueueData(ctx, userID, templateID, labels, nil, createdBy, targets...)`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`// Enqueue queues a notification message for later delivery.`
Original file line number	Diff line number	Diff line change
`@@ -221,10 +221,10 @@ func (n *notifier) prepare(ctx context.Context, msg database.AcquireNotification`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`var title, body string`
`224`		`- if title, err = render.GoTemplate(msg.TitleTemplate, payload, nil); err != nil {`
	`224`	`+ if title, err = render.GoTemplate(msg.TitleTemplate, payload, nil); err != nil { // FIXME helpers`
`225`	`225`	`return nil, xerrors.Errorf("render title: %w", err)`
`226`	`226`	`}`
`227`		`- if body, err = render.GoTemplate(msg.BodyTemplate, payload, nil); err != nil {`
	`227`	`+ if body, err = render.GoTemplate(msg.BodyTemplate, payload, nil); err != nil { // FIXME helpers`
`228`	`228`	`return nil, xerrors.Errorf("render body: %w", err)`
`229`	`229`	`}`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ type Notification struct {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func (f FakeNotificationsEnqueuer) Enqueue(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (uuid.UUID, error) {`
`24`		`- return f.EnqueueData(ctx, userID, templateID, labels, map[string]any{}, createdBy, targets...)`
	`24`	`+ return f.EnqueueData(ctx, userID, templateID, labels, nil, createdBy, targets...)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`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) {`