* check if orcid is empty

* remove confusion for user if record/comment is rejected
* prevent overwrite

Author: eltouma

src/email_queue_repository.go

@@ -74,7 +74,7 @@ func (r *PostgresEmailQueueRepository) GetPending(ctx context.Context, limit int
 }
 
 func (r *PostgresEmailQueueRepository) MarkAsSent(ctx context.Context, id int64) error {
-	res, err := r.db.ExecContext(ctx, `UPDATE email_queue SET status = $1, last_error = NULL, sent_at = NOW() WHERE id = $2`, SentStatus, id)
+	res, err := r.db.ExecContext(ctx, `UPDATE email_queue SET status = $1, last_error = NULL, sent_at = NOW() WHERE id = $2 AND status = $3`, SentStatus, id, ProcessingStatus)
 
 	if err != nil {
 		return fmt.Errorf("%s: failed to mark email queue item %d as sent: %w", repo, id, err)
@@ -87,7 +87,7 @@ func (r *PostgresEmailQueueRepository) MarkAsSent(ctx context.Context, id int64)
 }
 
 func (r *PostgresEmailQueueRepository) MarkAsFailed(ctx context.Context, id int64, errMsg string) error {
-	res, err := r.db.ExecContext(ctx, `UPDATE email_queue SET status = $1, attempts = (attempts + 1), last_error = $2 WHERE id = $3`, FailedStatus, errMsg, id)
+	res, err := r.db.ExecContext(ctx, `UPDATE email_queue SET status = $1, attempts = (attempts + 1), last_error = $2 WHERE id = $3 AND status = $4`, FailedStatus, errMsg, id, ProcessingStatus)
 
 	if err != nil {
 		return fmt.Errorf("%s: failed to mark email queue item %d as failed: %w", repo, id, err)
@@ -100,7 +100,7 @@ func (r *PostgresEmailQueueRepository) MarkAsFailed(ctx context.Context, id int6
 }
 
 func (r *PostgresEmailQueueRepository) MarkForRetry(ctx context.Context, id int64, errMsg string) error {
-	res, err := r.db.ExecContext(ctx, `UPDATE email_queue SET status = $1, attempts = (attempts + 1), last_error = $2 WHERE id = $3`, PendingStatus, errMsg, id)
+	res, err := r.db.ExecContext(ctx, `UPDATE email_queue SET status = $1, attempts = (attempts + 1), last_error = $2 WHERE id = $3 AND status = $4`, PendingStatus, errMsg, id, ProcessingStatus)
 
 	if err != nil {
 		return fmt.Errorf("%s: failed to mark email queue item %d as pending for retry: %w", repo, id, err)

src/notification_service.go

@@ -73,16 +73,18 @@ func buildApprovedCommentBody(action string, owner string, content string) Email
 
 func buildModerationBody(item string, status ModerationStatus) EmailBody {
 	var body string
+	var link string
 
 	switch status {
 	case StatusApproved:
 		body = fmt.Sprintf("Good news!\nYour %s has been approved by the ELN Community moderation team.\n\nIt is now available on the platform and can be shared with the community.", item)
+		link = "\n\nYou can view it here: https://eln.community"
 	case StatusRejected:
 		body = fmt.Sprintf("Your %s has been reviewed by the ELN Community moderation team and was not approved for publication.\n\nIf you think this is a mistake or need more information, please contact the ELN Community team at contact@deltablot.email.", item)
+		link = ""
 	}
 
-	fullBody := fmt.Sprintf("Hello,\n\n%s\n\nYou can view it here: https://eln.community\n\nThank you for contributing to open science.", body)
-	return buildEmailBody(fullBody)
+	return buildEmailBody(fmt.Sprintf("Hello,\n\n%s%s\n\nThank you for contributing to open science.", body, link))
 }
 
 func (s *NotificationService) enqueueEmail(ctx context.Context, recordId string, commentId sql.NullInt64, recipientOrcid string, subject string, bodyText string, bodyHTML string) error {

src/orcid_service.go

@@ -39,6 +39,9 @@ func (e *EmailUnavailable) Error() string {
 
 // https://info.orcid.org/documentation/api-tutorials/api-tutorial-read-data-on-a-record
 func GetEmail(ctx context.Context, orcid string) (string, error) {
+	if strings.TrimSpace(orcid) == "" {
+		return "", fmt.Errorf("%s: orcid parameter is empty", orcidService)
+	}
 	address := strings.Join([]string{"https://pub.orcid.org/v3.0/", orcid, "/email"}, "")
 
 	req, err := http.NewRequestWithContext(ctx, "GET", address, nil)