feat(notifications): working on tests for logo and app_name

defelmnq · defelmnq · commit 0c131a5acd53 · 2024-10-17T03:06:50.000+02:00
diff --git a/coderd/notifications/dispatch/smtp/html.gotmpl b/coderd/notifications/dispatch/smtp/html.gotmpl
@@ -8,10 +8,7 @@
   <body style="margin: 0; padding: 0; font-family: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; color: #020617; background: #f8fafc;">
     <div style="max-width: 600px; margin: 20px auto; padding: 60px; border: 1px solid #e2e8f0; border-radius: 8px; background-color: #fff; text-align: left; font-size: 14px; line-height: 1.5;">
       <div style="text-align: center;">
-        <img src="{{ logo_url }}" alt="Logo" style="height: 40px;" />
-        <h1 style="text-align: center; font-size: 36px; font-weight: 400; margin: 8px 0 32px; line-height: 1.5;">
-          {{ app_name }}
-        </h1>
+        <img src="{{ logo_url }}" alt="{{ app_name }} Logo" style="height: 40px;" />
       </div>
       <h1 style="text-align: center; font-size: 24px; font-weight: 400; margin: 8px 0 32px; line-height: 1.5;">
         {{ .Labels._subject }}
diff --git a/coderd/notifications/fetcher.go b/coderd/notifications/fetcher.go
@@ -0,0 +1,31 @@
+package notifications
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"golang.org/x/xerrors"
+)
+
+func (n *notifier) FetchAppName(ctx context.Context) (string, error) {
+	appName, err := n.store.GetApplicationName(ctx)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return notificationsDefaultAppName, nil
+		}
+		return "", xerrors.Errorf("get organization: %w", err)
+	}
+	return appName, nil
+}
+
+func (n *notifier) FetchLogoURL(ctx context.Context) (string, error) {
+	logoURL, err := n.store.GetLogoURL(ctx)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return notificationsDefaultLogoURL, nil
+		}
+		return "", xerrors.Errorf("get logo URL: %w", err)
+	}
+	return logoURL, nil
+}
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -2,9 +2,7 @@ package notifications
 
 import (
 	"context"
-	"database/sql"
 	"encoding/json"
-	"errors"
 	"sync"
 	"text/template"
 
@@ -230,25 +228,18 @@ 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
+	helpers := make(template.FuncMap)
+	for k, v := range n.helpers {
+		helpers[k] = v
 	}
 
-	logoURL, err := n.store.GetLogoURL(ctx)
+	appName, err := n.FetchAppName(ctx)
 	if err != nil {
-		if !errors.Is(err, sql.ErrNoRows) {
-			return nil, xerrors.Errorf("get logo URL: %w", err)
-		}
-		logoURL = notificationsDefaultLogoURL
+		return nil, xerrors.Errorf("fetch app name: %w", err)
 	}
-
-	helpers := make(template.FuncMap)
-	for k, v := range n.helpers {
-		helpers[k] = v
+	logoURL, err := n.FetchLogoURL(ctx)
+	if err != nil {
+		return nil, xerrors.Errorf("fetch logo URL: %w", err)
 	}
 
 	helpers["app_name"] = func() string { return appName }
diff --git a/coderd/notifications/utils_test.go b/coderd/notifications/utils_test.go
@@ -39,8 +39,6 @@ func defaultHelpers() map[string]any {
 	return map[string]any{
 		"base_url":     func() string { return "http://test.com" },
 		"current_year": func() string { return "2024" },
-		"logo_url":     func() string { return "https://coder.com/coder-logo-horizontal.png" },
-		"app_name":     func() string { return "Coder" },
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ func defaultHelpers() map[string]any {`
`39`	`39`	`return map[string]any{`
`40`	`40`	`"base_url": func() string { return "http://test.com" },`
`41`	`41`	`"current_year": func() string { return "2024" },`
`42`		`- "logo_url": func() string { return "https://coder.com/coder-logo-horizontal.png" },`
`43`		`- "app_name": func() string { return "Coder" },`
`44`	`42`	`}`
`45`	`43`	`}`
`46`	`44`