Correct swagger annotations for enums, status codes, and notification state (#37030)

## ⚠️ BREAKING ⚠️

- delete reaction endpoints is changed to return 204 No Content rather
than 200 with no content.

## Summary

Add swagger:enum annotations and migrate all enum comments from the
deprecated comma-separated format to JSON arrays. Introduce
NotifySubjectStateType with open/closed/merged values. Fix delete
reaction endpoints to return 204 instead of 200.

services/convert/notification.go

@@ -47,7 +47,7 @@ func ToNotificationThread(ctx context.Context, n *activities_model.Notification)
 			result.Subject.Title = n.Issue.Title
 			result.Subject.URL = n.Issue.APIURL(ctx)
 			result.Subject.HTMLURL = n.Issue.HTMLURL(ctx)
-			result.Subject.State = n.Issue.State()
+			result.Subject.State = api.NotifySubjectStateType(n.Issue.State())
 			comment, err := n.Issue.GetLastComment(ctx)
 			if err == nil && comment != nil {
 				result.Subject.LatestCommentURL = comment.APIURL(ctx)
@@ -60,7 +60,7 @@ func ToNotificationThread(ctx context.Context, n *activities_model.Notification)
 			result.Subject.Title = n.Issue.Title
 			result.Subject.URL = n.Issue.APIURL(ctx)
 			result.Subject.HTMLURL = n.Issue.HTMLURL(ctx)
-			result.Subject.State = n.Issue.State()
+			result.Subject.State = api.NotifySubjectStateType(n.Issue.State())
 			comment, err := n.Issue.GetLastComment(ctx)
 			if err == nil && comment != nil {
 				result.Subject.LatestCommentURL = comment.APIURL(ctx)
@@ -70,7 +70,7 @@ func ToNotificationThread(ctx context.Context, n *activities_model.Notification)
 			if err := n.Issue.LoadPullRequest(ctx); err == nil &&
 				n.Issue.PullRequest != nil &&
 				n.Issue.PullRequest.HasMerged {
-				result.Subject.State = "merged"
+				result.Subject.State = api.NotifySubjectStateMerged
 			}
 		}
 	case activities_model.NotificationSourceCommit:

services/convert/notification_test.go

@@ -7,12 +7,15 @@ import (
 	"testing"
 
 	activities_model "code.gitea.io/gitea/models/activities"
+	issues_model "code.gitea.io/gitea/models/issues"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
+	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestToNotificationThreadIncludesRepoForAccessibleUser(t *testing.T) {
@@ -36,6 +39,78 @@ func TestToNotificationThreadOmitsRepoWhenAccessRevoked(t *testing.T) {
 	assert.Nil(t, thread.Repository)
 }
 
+func TestToNotificationThread(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	t.Run("issue notification", func(t *testing.T) {
+		// Notification 1: source=issue, issue_id=1, status=unread
+		n := unittest.AssertExistsAndLoadBean(t, &activities_model.Notification{ID: 1})
+		require.NoError(t, n.LoadAttributes(t.Context()))
+
+		thread := ToNotificationThread(t.Context(), n)
+		assert.Equal(t, int64(1), thread.ID)
+		assert.True(t, thread.Unread)
+		assert.False(t, thread.Pinned)
+		require.NotNil(t, thread.Subject)
+		assert.Equal(t, api.NotifySubjectIssue, thread.Subject.Type)
+		assert.Equal(t, api.NotifySubjectStateOpen, thread.Subject.State)
+	})
+
+	t.Run("pinned notification", func(t *testing.T) {
+		// Notification 3: status=pinned
+		n := unittest.AssertExistsAndLoadBean(t, &activities_model.Notification{ID: 3})
+		require.NoError(t, n.LoadAttributes(t.Context()))
+
+		thread := ToNotificationThread(t.Context(), n)
+		assert.False(t, thread.Unread)
+		assert.True(t, thread.Pinned)
+	})
+
+	t.Run("merged pull request returns merged state", func(t *testing.T) {
+		// Issue 2 is a pull request; pull_request 1 has has_merged=true.
+		issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
+
+		n := &activities_model.Notification{
+			ID:         999,
+			UserID:     2,
+			RepoID:     repo.ID,
+			Status:     activities_model.NotificationStatusUnread,
+			Source:     activities_model.NotificationSourcePullRequest,
+			IssueID:    issue.ID,
+			Issue:      issue,
+			Repository: repo,
+		}
+
+		thread := ToNotificationThread(t.Context(), n)
+		require.NotNil(t, thread.Subject)
+		assert.Equal(t, api.NotifySubjectPull, thread.Subject.Type)
+		assert.Equal(t, api.NotifySubjectStateMerged, thread.Subject.State)
+	})
+
+	t.Run("open pull request returns open state", func(t *testing.T) {
+		// Issue 3 is a pull request; pull_request 2 has has_merged=false.
+		issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 3})
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
+
+		n := &activities_model.Notification{
+			ID:         998,
+			UserID:     2,
+			RepoID:     repo.ID,
+			Status:     activities_model.NotificationStatusUnread,
+			Source:     activities_model.NotificationSourcePullRequest,
+			IssueID:    issue.ID,
+			Issue:      issue,
+			Repository: repo,
+		}
+
+		thread := ToNotificationThread(t.Context(), n)
+		require.NotNil(t, thread.Subject)
+		assert.Equal(t, api.NotifySubjectPull, thread.Subject.Type)
+		assert.Equal(t, api.NotifySubjectStateOpen, thread.Subject.State)
+	})
+}
+
 func newRepoNotification(t *testing.T, repoID, userID int64) *activities_model.Notification {
 	t.Helper()
 

services/convert/status.go

@@ -9,6 +9,7 @@ import (
 
 	git_model "code.gitea.io/gitea/models/git"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/commitstatus"
 	api "code.gitea.io/gitea/modules/structs"
 )
 
@@ -55,6 +56,8 @@ func ToCombinedStatus(ctx context.Context, commitID string, statuses []*git_mode
 	if combinedStatus != nil {
 		status.Statuses = ToCommitStatuses(ctx, statuses)
 		status.State = combinedStatus.State
+	} else {
+		status.State = commitstatus.CommitStatusPending
 	}
 	return &status
 }