Merge remote-tracking branch 'origin/master'

svc/routes/mk_mail_helper.go

@@ -0,0 +1,68 @@
+package routes
+
+import (
+	"bssapp-backend/utils"
+	"database/sql"
+	"errors"
+	"regexp"
+	"strings"
+)
+
+var simpleEmailRe = regexp.MustCompile(`^[^\s@]+@[^\s@]+\.[^\s@]+$`)
+
+// ensureMkMail makes sure the given email exists in mk_mail.
+// If it already exists (case-insensitive match), it is re-activated and normalized.
+// This is intentionally tolerant (no ON CONFLICT) to avoid relying on a specific unique constraint.
+func ensureMkMail(tx *sql.Tx, email string) error {
+	mail := strings.ToLower(strings.TrimSpace(email))
+	if mail == "" {
+		return nil
+	}
+	if !simpleEmailRe.MatchString(mail) {
+		// user email field can be free-form; don't hard fail user save because of mk_mail bookkeeping
+		return nil
+	}
+
+	var id string
+	err := tx.QueryRow(`
+		SELECT m.id::text
+		FROM mk_mail m
+		WHERE LOWER(TRIM(m.email)) = LOWER(TRIM($1))
+		LIMIT 1
+	`, mail).Scan(&id)
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+
+	if errors.Is(err, sql.ErrNoRows) {
+		newID := utils.NewUUID()
+		_, err = tx.Exec(`
+			INSERT INTO mk_mail (
+				id,
+				email,
+				display_name,
+				"type",
+				is_primary,
+				external_id,
+				is_active,
+				created_at
+			)
+			VALUES ($1, $2, '', 'user', true, true, true, NOW())
+		`, newID, mail)
+		return err
+	}
+
+	// Exists: normalize + activate. Avoid touching created_at.
+	_, err = tx.Exec(`
+		UPDATE mk_mail
+		SET
+			email = $2,
+			display_name = COALESCE(display_name, ''),
+			"type" = 'user',
+			is_primary = true,
+			external_id = true,
+			is_active = true
+		WHERE id::text = $1
+	`, id, mail)
+	return err
+}