return number of notifications if unreaded exist

Author: 6543

models/notification.go

@@ -295,16 +295,16 @@ func notificationsForUser(e Engine, user *User, statuses []NotificationStatus, p
 	return
 }
 
-// UnreadAvailable check if unread notifications exist
-func UnreadAvailable(user *User) bool {
-	return unreadAvailable(x, user.ID)
+// CountUnread count unread notifications for a user
+func CountUnread(user *User) int64 {
+	return countUnread(x, user.ID)
 }
 
-func unreadAvailable(e Engine, userID int64) bool {
-	exist, err := e.Where("user_id = ?", userID).And("status = ?", NotificationStatusUnread).Get(new(Notification))
+func countUnread(e Engine, userID int64) int64 {
+	exist, err := e.Where("user_id = ?", userID).And("status = ?", NotificationStatusUnread).Count(new(Notification))
 	if err != nil {
-		log.Error("newsAvailable", err)
-		return false
+		log.Error("countUnread", err)
+		return 0
 	}
 	return exist
 }

modules/structs/notifications.go

@@ -26,3 +26,8 @@ type NotificationSubject struct {
 	LatestCommentURL string `json:"latest_comment_url"`
 	Type             string `json:"type" binding:"In(Issue,Pull,Commit)"`
 }
+
+// NotificationCount number of unread notifications
+type NotificationCount struct {
+	New int64 `json:"new"`
+}

routers/api/v1/notify/notifications.go

@@ -9,6 +9,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	api "code.gitea.io/gitea/modules/structs"
 )
 
 // NewAvailable check if unread notifications exist
@@ -20,10 +21,12 @@ func NewAvailable(ctx *context.APIContext) {
 	//   "204":
 	//     description: No unread notification
 	//   "302":
-	//     description: Unread notification found
+	//    "$ref": "#/responses/NotificationCount"
 
-	if models.UnreadAvailable(ctx.User) {
-		ctx.Status(http.StatusFound)
+	count := models.CountUnread(ctx.User)
+
+	if count > 0 {
+		ctx.JSON(http.StatusFound, api.NotificationCount{New: count})
 	} else {
 		ctx.Status(http.StatusNoContent)
 	}

routers/api/v1/swagger/notify.go

@@ -21,3 +21,10 @@ type swaggerNotificationThreadList struct {
 	// in:body
 	Body []api.NotificationThread `json:"body"`
 }
+
+// Number of unread notifications
+// swagger:response NotificationCount
+type swaggerNotificationCount struct {
+	// in:body
+	Body api.NotificationCount `json:"body"`
+}

templates/swagger/v1_json.tmpl

@@ -506,7 +506,7 @@
             "description": "No unread notification"
           },
           "302": {
-            "description": "Unread notification found"
+            "$ref": "#/responses/NotificationCount"
           }
         }
       }
@@ -10928,6 +10928,18 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
+    "NotificationCount": {
+      "description": "NotificationCount number of unread notifications",
+      "type": "object",
+      "properties": {
+        "new": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "New"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/modules/structs"
+    },
     "NotificationSubject": {
       "description": "NotificationSubject contains the notification subject (Issue/Pull/Commit)",
       "type": "object",
@@ -12414,6 +12426,12 @@
         }
       }
     },
+    "NotificationCount": {
+      "description": "Number of unread notifications",
+      "schema": {
+        "$ref": "#/definitions/NotificationCount"
+      }
+    },
     "NotificationThread": {
       "description": "NotificationThread",
       "schema": {