fixes & tests

Author: pierre-b

CHANGELOG.md

@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file.
 
 - **Segments**: Added template filter to email activity conditions, allowing segments like "opened template X at least 3 times"
 - **SMTP**: Fixed TLS override option not working for system emails (magic codes, invitations, alerts). The "Use TLS" toggle was ignored, causing certificate errors on local SMTP relays (#275)
+- **Automations**: Fixed automation emails rendering `{{ notification_center_url }}` and `{{ unsubscribe_url }}` as empty strings by using the shared template data builder (#279)
+- **Segments**: Fixed race condition where background task execution could pick up unrelated tasks, causing flaky segment recompute behavior
 
 ## [27.2] - 2026-02-21
 

internal/app/app.go

@@ -953,6 +953,7 @@ func (a *App) InitServices() error {
 		a.contactRepo,
 		a.workspaceRepo,
 		a.contactListRepo,
+		a.listRepo,
 		a.templateRepo,
 		a.emailQueueRepo,
 		a.messageHistoryRepo,

internal/service/automation_executor.go

@@ -31,6 +31,7 @@ func NewAutomationExecutor(
 	contactRepo domain.ContactRepository,
 	workspaceRepo domain.WorkspaceRepository,
 	contactListRepo domain.ContactListRepository,
+	listRepo domain.ListRepository,
 	templateRepo domain.TemplateRepository,
 	emailQueueRepo domain.EmailQueueRepository,
 	messageRepo domain.MessageHistoryRepository,
@@ -43,7 +44,7 @@ func NewAutomationExecutor(
 	executors := map[domain.NodeType]NodeExecutor{
 		domain.NodeTypeTrigger:          NewTriggerNodeExecutor(),
 		domain.NodeTypeDelay:            NewDelayNodeExecutor(),
-		domain.NodeTypeEmail:            NewEmailNodeExecutor(emailQueueRepo, templateRepo, workspaceRepo, apiEndpoint, log),
+		domain.NodeTypeEmail:            NewEmailNodeExecutor(emailQueueRepo, templateRepo, workspaceRepo, listRepo, apiEndpoint, log),
 		domain.NodeTypeBranch:           NewBranchNodeExecutor(qb, workspaceRepo),
 		domain.NodeTypeFilter:           NewFilterNodeExecutor(qb, workspaceRepo),
 		domain.NodeTypeAddToList:        NewAddToListNodeExecutor(contactListRepo),

internal/service/automation_node_executor.go

@@ -147,6 +147,7 @@ type EmailNodeExecutor struct {
 	emailQueueRepo domain.EmailQueueRepository
 	templateRepo   domain.TemplateRepository
 	workspaceRepo  domain.WorkspaceRepository
+	listRepo       domain.ListRepository
 	apiEndpoint    string
 	logger         logger.Logger
 }
@@ -156,13 +157,15 @@ func NewEmailNodeExecutor(
 	emailQueueRepo domain.EmailQueueRepository,
 	templateRepo domain.TemplateRepository,
 	workspaceRepo domain.WorkspaceRepository,
+	listRepo domain.ListRepository,
 	apiEndpoint string,
 	log logger.Logger,
 ) *EmailNodeExecutor {
 	return &EmailNodeExecutor{
 		emailQueueRepo: emailQueueRepo,
 		templateRepo:   templateRepo,
 		workspaceRepo:  workspaceRepo,
+		listRepo:       listRepo,
 		apiEndpoint:    apiEndpoint,
 		logger:         log,
 	}
@@ -226,13 +229,10 @@ func (e *EmailNodeExecutor) Execute(ctx context.Context, params NodeExecutionPar
 		return nil, fmt.Errorf("failed to get template: %w", err)
 	}
 
-	// 5. Build template data from contact + automation
-	templateData := buildAutomationTemplateData(params.ContactData, params.Automation)
-
-	// 6. Generate message ID
+	// 5. Generate message ID
 	messageID := fmt.Sprintf("%s_%s", params.WorkspaceID, uuid.New().String())
 
-	// 7. Setup tracking settings
+	// 6. Setup tracking settings
 	endpoint := e.apiEndpoint
 	if workspace.Settings.CustomEndpointURL != nil && *workspace.Settings.CustomEndpointURL != "" {
 		endpoint = *workspace.Settings.CustomEndpointURL
@@ -249,13 +249,39 @@ func (e *EmailNodeExecutor) Execute(ctx context.Context, params NodeExecutionPar
 		MessageID:      messageID,
 	}
 
+	// 7. Build template data using shared domain.BuildTemplateData
+	var listID, listName string
+	if params.Automation.ListID != "" {
+		list, err := e.listRepo.GetListByID(ctx, params.WorkspaceID, params.Automation.ListID)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get list: %w", err)
+		}
+		listID = list.ID
+		listName = list.Name
+	}
+
+	templateData, err := domain.BuildTemplateData(domain.TemplateDataRequest{
+		WorkspaceID:        params.WorkspaceID,
+		WorkspaceSecretKey: workspace.Settings.SecretKey,
+		ContactWithList:    domain.ContactWithList{Contact: params.ContactData, ListID: listID, ListName: listName},
+		MessageID:          messageID,
+		TrackingSettings:   trackingSettings,
+		ProvidedData: domain.MapOfAny{
+			"automation_id":   params.Automation.ID,
+			"automation_name": params.Automation.Name,
+		},
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to build template data: %w", err)
+	}
+
 	// 8. Compile template
 	compiledTemplate, err := notifuse_mjml.CompileTemplate(
 		notifuse_mjml.CompileTemplateRequest{
 			WorkspaceID:      params.WorkspaceID,
 			MessageID:        messageID,
 			VisualEditorTree: template.Email.VisualEditorTree,
-			TemplateData:     templateData,
+			TemplateData:     notifuse_mjml.MapOfAny(templateData),
 			TrackingSettings: trackingSettings,
 		},
 	)
@@ -314,7 +340,12 @@ func (e *EmailNodeExecutor) Execute(ctx context.Context, params NodeExecutionPar
 		UpdatedAt:   time.Now().UTC(),
 	}
 
-	// 12. Enqueue the email
+	// 12. Add List-Unsubscribe header for RFC-8058 compliance
+	if url, ok := templateData["oneclick_unsubscribe_url"].(string); ok && url != "" {
+		entry.Payload.EmailOptions.ListUnsubscribeURL = url
+	}
+
+	// 13. Enqueue the email
 	if err := e.emailQueueRepo.Enqueue(ctx, params.WorkspaceID, []*domain.EmailQueueEntry{entry}); err != nil {
 		return nil, fmt.Errorf("failed to enqueue email: %w", err)
 	}
@@ -358,47 +389,6 @@ func parseEmailNodeConfig(config map[string]interface{}) (*domain.EmailNodeConfi
 	return &c, nil
 }
 
-// buildAutomationTemplateData creates template data for automation emails
-func buildAutomationTemplateData(contact *domain.Contact, automation *domain.Automation) map[string]interface{} {
-	data := make(map[string]interface{})
-
-	if contact != nil {
-		// Add contact fields
-		data["email"] = contact.Email
-
-		// Convert contact to map for proper liquid template rendering
-		// This ensures NullableString fields are converted to plain strings
-		contactData, err := contact.ToMapOfAny()
-		if err != nil {
-			// Fallback to empty map if conversion fails
-			contactData = domain.MapOfAny{}
-		}
-		data["contact"] = contactData
-
-		// Add standard contact fields if they exist (for backward compatibility)
-		if contact.FirstName != nil && !contact.FirstName.IsNull {
-			data["first_name"] = contact.FirstName.String
-		}
-		if contact.LastName != nil && !contact.LastName.IsNull {
-			data["last_name"] = contact.LastName.String
-		}
-		if contact.FullName != nil && !contact.FullName.IsNull {
-			data["full_name"] = contact.FullName.String
-		}
-		if contact.Country != nil && !contact.Country.IsNull {
-			data["country"] = contact.Country.String
-		}
-	}
-
-	if automation != nil {
-		// Add automation context
-		data["automation_id"] = automation.ID
-		data["automation_name"] = automation.Name
-	}
-
-	return data
-}
-
 // BranchNodeExecutor executes branch nodes using database queries
 type BranchNodeExecutor struct {
 	queryBuilder  *QueryBuilder