postmark message id

Author: pierre-b

internal/service/postmark_service.go

@@ -545,14 +545,8 @@ func (s *PostmarkService) SendEmail(ctx context.Context, workspaceID string, mes
 		"To":       to,
 		"Subject":  subject,
 		"HtmlBody": content,
-		"Headers": []map[string]string{
-			{
-				"Name":  "Message-ID",
-				"Value": messageID,
-			},
-			{
-				"X-PM-KeepID": "true",
-			},
+		"Metadata": map[string]string{
+			"notifuse_message_id": messageID,
 		},
 	}
 

internal/service/webhook_event_service.go

@@ -291,16 +291,10 @@ func (s *WebhookEventService) processPostmarkWebhook(integrationID string, rawPa
 	var timestamp time.Time
 	var notifuseMessageID string
 
-	// Check for custom Message-ID header in the Headers field
-	if headersData, ok := jsonData["Headers"].([]interface{}); ok {
-		for _, header := range headersData {
-			if headerMap, ok := header.(map[string]interface{}); ok {
-				if name, ok := headerMap["Name"].(string); ok && name == "Message-ID" {
-					if value, ok := headerMap["Value"].(string); ok {
-						notifuseMessageID = value
-					}
-				}
-			}
+	// Check for notifuse_message_id in metadata
+	if payload.Metadata != nil {
+		if msgID, ok := payload.Metadata["notifuse_message_id"]; ok {
+			notifuseMessageID = msgID
 		}
 	}