fixme helpers

mtojek · mtojek · commit 96c4062e8db6 · 2024-09-06T13:12:26.000+02:00
diff --git a/coderd/notifications/manager.go b/coderd/notifications/manager.go
@@ -46,6 +46,7 @@ type Manager struct {
 	notifier *notifier
 	handlers map[database.NotificationMethod]Handler
 	method   database.NotificationMethod
+	helpers  template.FuncMap
 
 	metrics *Metrics
 
@@ -108,6 +109,7 @@ func NewManager(cfg codersdk.NotificationsConfig, store Store, helpers template.
 		done: make(chan any),
 
 		handlers: defaultHandlers(cfg, helpers, log),
+		helpers:  helpers,
 
 		clock: quartz.NewReal(),
 	}
@@ -169,7 +171,7 @@ func (m *Manager) loop(ctx context.Context) error {
 	var eg errgroup.Group
 
 	// Create a notifier to run concurrently, which will handle dequeueing and dispatching notifications.
-	m.notifier = newNotifier(m.cfg, uuid.New(), m.log, m.store, m.handlers, m.metrics, m.clock)
+	m.notifier = newNotifier(m.cfg, uuid.New(), m.log, m.store, m.handlers, m.helpers, m.metrics, m.clock)
 	eg.Go(func() error {
 		return m.notifier.run(ctx, m.success, m.failure)
 	})
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"sync"
+	"text/template"
 
 	"github.com/google/uuid"
 	"golang.org/x/sync/errgroup"
@@ -36,13 +37,14 @@ type notifier struct {
 
 	handlers map[database.NotificationMethod]Handler
 	metrics  *Metrics
+	helpers  template.FuncMap
 
 	// clock is for testing
 	clock quartz.Clock
 }
 
 func newNotifier(cfg codersdk.NotificationsConfig, id uuid.UUID, log slog.Logger, db Store,
-	hr map[database.NotificationMethod]Handler, metrics *Metrics, clock quartz.Clock,
+	hr map[database.NotificationMethod]Handler, helpers template.FuncMap, metrics *Metrics, clock quartz.Clock,
 ) *notifier {
 	tick := clock.NewTicker(cfg.FetchInterval.Value(), "notifier", "fetchInterval")
 	return &notifier{
@@ -54,6 +56,7 @@ func newNotifier(cfg codersdk.NotificationsConfig, id uuid.UUID, log slog.Logger
 		tick:     tick,
 		store:    db,
 		handlers: hr,
+		helpers:  helpers,
 		metrics:  metrics,
 		clock:    clock,
 	}
@@ -221,10 +224,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 { // FIXME helpers
+	if title, err = render.GoTemplate(msg.TitleTemplate, payload, n.helpers); err != nil {
 		return nil, xerrors.Errorf("render title: %w", err)
 	}
-	if body, err = render.GoTemplate(msg.BodyTemplate, payload, nil); err != nil { // FIXME helpers
+	if body, err = render.GoTemplate(msg.BodyTemplate, payload, n.helpers); err != nil {
 		return nil, xerrors.Errorf("render body: %w", err)
 	}
 
