feat(notifications): improve logo_url and app_name fetching moving it to notifications package

defelmnq · defelmnq · commit 73e07e9880a3 · 2024-10-16T14:29:21.000+02:00
diff --git a/cli/server.go b/cli/server.go
@@ -1309,36 +1309,6 @@ func templateHelpers(options *coderd.Options) map[string]any {
 	return map[string]any{
 		"base_url":     func() string { return options.AccessURL.String() },
 		"current_year": func() string { return strconv.Itoa(time.Now().Year()) },
-		"logo_url": func() string {
-			ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
-			defer cancel()
-
-			logoURL, err := options.Database.GetLogoURL(ctx)
-			if err != nil {
-				if errors.Is(err, sql.ErrNoRows) {
-					return notifications.NotificationsDefaultLogoURL
-				}
-
-				return ""
-			}
-
-			return logoURL
-		},
-		"app_name": func() string {
-			ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
-			defer cancel()
-
-			appName, err := options.Database.GetApplicationName(ctx)
-			if err != nil {
-				if errors.Is(err, sql.ErrNoRows) {
-					return notifications.NotificationsDefaultAppName
-				}
-
-				return ""
-			}
-
-			return appName
-		},
 	}
 }
 
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -2,7 +2,9 @@ package notifications
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
+	"errors"
 	"sync"
 	"text/template"
 
@@ -23,8 +25,8 @@ import (
 )
 
 const (
-	NotificationsDefaultLogoURL = "https://coder.com/coder-logo-horizontal.png"
-	NotificationsDefaultAppName = "Coder"
+	notificationsDefaultLogoURL = "https://coder.com/coder-logo-horizontal.png"
+	notificationsDefaultAppName = "Coder"
 )
 
 // notifier is a consumer of the notifications_messages queue. It dequeues messages from that table and processes them
@@ -228,6 +230,30 @@ func (n *notifier) prepare(ctx context.Context, msg database.AcquireNotification
 		return nil, xerrors.Errorf("failed to resolve handler %q", msg.Method)
 	}
 
+	appName, err := n.store.GetApplicationName(ctx)
+	if err != nil {
+		if !errors.Is(err, sql.ErrNoRows) {
+			return nil, xerrors.Errorf("get application name: %w", err)
+		}
+		appName = notificationsDefaultAppName
+	}
+
+	logoURL, err := n.store.GetLogoURL(ctx)
+	if err != nil {
+		if !errors.Is(err, sql.ErrNoRows) {
+			return nil, xerrors.Errorf("get logo URL: %w", err)
+		}
+		logoURL = notificationsDefaultLogoURL
+	}
+
+	helpers := make(template.FuncMap)
+	for k, v := range n.helpers {
+		helpers[k] = v
+	}
+
+	helpers["app_name"] = func() string { return appName }
+	helpers["logo_url"] = func() string { return logoURL }
+
 	var title, body string
 	if title, err = render.GoTemplate(msg.TitleTemplate, payload, n.helpers); err != nil {
 		return nil, xerrors.Errorf("render title: %w", err)
diff --git a/coderd/notifications/spec.go b/coderd/notifications/spec.go
@@ -22,6 +22,8 @@ type Store interface {
 	FetchNewMessageMetadata(ctx context.Context, arg database.FetchNewMessageMetadataParams) (database.FetchNewMessageMetadataRow, error)
 	GetNotificationMessagesByStatus(ctx context.Context, arg database.GetNotificationMessagesByStatusParams) ([]database.NotificationMessage, error)
 	GetNotificationsSettings(ctx context.Context) (string, error)
+	GetApplicationName(ctx context.Context) (string, error)
+	GetLogoURL(ctx context.Context) (string, error)
 }
 
 // Handler is responsible for preparing and delivering a notification by a given method.

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ type Store interface {`
`22`	`22`	`FetchNewMessageMetadata(ctx context.Context, arg database.FetchNewMessageMetadataParams) (database.FetchNewMessageMetadataRow, error)`
`23`	`23`	`GetNotificationMessagesByStatus(ctx context.Context, arg database.GetNotificationMessagesByStatusParams) ([]database.NotificationMessage, error)`
`24`	`24`	`GetNotificationsSettings(ctx context.Context) (string, error)`
	`25`	`+ GetApplicationName(ctx context.Context) (string, error)`
	`26`	`+ GetLogoURL(ctx context.Context) (string, error)`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`// Handler is responsible for preparing and delivering a notification by a given method.`