Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Notification API should always return a JSON object with the current count of notifications #10059

Merged
merged 5 commits into from
Apr 10, 2020
Merged

Notification API should always return a JSON object with the current count of notifications #10059

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
533f52a
BEAKING: check return status based on struct not httpStatus
6543 Jan 29, 2020
a4075e3
update Tests
6543 Apr 9, 2020
191c285
CI.restart()
6543 Apr 9, 2020
a95785e
Merge branch 'master' into api-check-notify_always-json
6543 Apr 10, 2020
826346a
Merge branch 'master' into api-check-notify_always-json
6543 Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
BEAKING: check return status based on struct not httpStatus
  • Loading branch information
@6543
6543 committed Apr 9, 2020
commit 533f52a39dfbd568c7f0020e76d40586192ae56b
13 changes: 2 additions & 11 deletions routers/api/v1/notify/notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@ func NewAvailable(ctx *context.APIContext) {
// summary: Check if unread notifications exist
// responses:
// "200":
// "$ref": "#/responses/NotificationCount"
// "204":
// description: No unread notification

count := models.CountUnread(ctx.User)

if count > 0 {
ctx.JSON(http.StatusOK, api.NotificationCount{New: count})
} else {
ctx.Status(http.StatusNoContent)
}
// "$ref": "#/responses/NotificationCount"
ctx.JSON(http.StatusOK, api.NotificationCount{New: models.CountUnread(ctx.User)})
}
3 changes: 0 additions & 3 deletions templates/swagger/v1_json.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,9 +530,6 @@
"responses": {
"200": {
"$ref": "#/responses/NotificationCount"
},
"204": {
"description": "No unread notification"
}
}
}
Expand Down