aiden
/
synctv
mirror of https://github.com/synctv-org/synctv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: sord and order

Browse Source
pull/31/head v0.3.0-alpha-3
zijiren233 2 years ago
parent 4346e4f9bb
commit 957e9702d5
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

24
server/handlers/admin.go
Unescape Escape View File

@ -70,7 +70,7 @@ func Users(ctx *gin.Context) {
return
}
var desc = ctx.DefaultQuery("sort", "desc") == "desc"
var desc = ctx.DefaultQuery("order", "desc") == "desc"
scopes := []func(db *gorm.DB) *gorm.DB{}
@ -87,7 +87,7 @@ func Users(ctx *gin.Context) {
scopes = append(scopes, db.WhereRole(dbModel.RoleRoot))
}
switch ctx.DefaultQuery("order", "name") {
switch ctx.DefaultQuery("sort", "name") {
case "createdAt":
if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc)
@ -101,7 +101,7 @@ func Users(ctx *gin.Context) {
scopes = append(scopes, db.OrderByAsc("username"))
}
default:
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort"))
return
}
@ -149,13 +149,13 @@ func GetRoomUsers(ctx *gin.Context) {
return
}
var desc = ctx.DefaultQuery("sort", "desc") == "desc"
var desc = ctx.DefaultQuery("order", "desc") == "desc"
scopes := []func(db *gorm.DB) *gorm.DB{
db.PreloadRoomUserRelation(db.WhereRoomID(id)),
}
switch ctx.DefaultQuery("order", "name") {
switch ctx.DefaultQuery("sort", "name") {
case "createdAt":
if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc)
@ -169,7 +169,7 @@ func GetRoomUsers(ctx *gin.Context) {
scopes = append(scopes, db.OrderByAsc("username"))
}
default:
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort"))
return
}
@ -304,7 +304,7 @@ func Rooms(ctx *gin.Context) {
return
}
var desc = ctx.DefaultQuery("sort", "desc") == "desc"
var desc = ctx.DefaultQuery("order", "desc") == "desc"
scopes := []func(db *gorm.DB) *gorm.DB{}
@ -317,7 +317,7 @@ func Rooms(ctx *gin.Context) {
scopes = append(scopes, db.WhereStatus(dbModel.RoomStatusBanned))
}
switch ctx.DefaultQuery("order", "name") {
switch ctx.DefaultQuery("sort", "name") {
case "createdAt":
if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc)
@ -331,7 +331,7 @@ func Rooms(ctx *gin.Context) {
scopes = append(scopes, db.OrderByAsc("name"))
}
default:
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort"))
return
}
@ -369,7 +369,7 @@ func GetUserRooms(ctx *gin.Context) {
return
}
var desc = ctx.DefaultQuery("sort", "desc") == "desc"
var desc = ctx.DefaultQuery("order", "desc") == "desc"
scopes := []func(db *gorm.DB) *gorm.DB{
db.WhereCreatorID(id),
@ -384,7 +384,7 @@ func GetUserRooms(ctx *gin.Context) {
scopes = append(scopes, db.WhereStatus(dbModel.RoomStatusBanned))
}
switch ctx.DefaultQuery("order", "name") {
switch ctx.DefaultQuery("sort", "name") {
case "createdAt":
if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc)
@ -398,7 +398,7 @@ func GetUserRooms(ctx *gin.Context) {
scopes = append(scopes, db.OrderByAsc("name"))
}
default:
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort"))
return
}

12
server/handlers/room.go
Unescape Escape View File

@ -89,14 +89,14 @@ func RoomList(ctx *gin.Context) {
return
}
var desc = ctx.DefaultQuery("sort", "desc") == "desc"
var desc = ctx.DefaultQuery("order", "desc") == "desc"
scopes := []func(db *gorm.DB) *gorm.DB{
db.WhereRoomSettingWithoutHidden(),
db.WhereStatus(dbModel.RoomStatusActive),
}
switch ctx.DefaultQuery("order", "name") {
switch ctx.DefaultQuery("sort", "name") {
case "createdAt":
if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc)
@ -110,7 +110,7 @@ func RoomList(ctx *gin.Context) {
scopes = append(scopes, db.OrderByAsc("name"))
}
default:
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort"))
return
}
@ -282,7 +282,7 @@ func RoomUsers(ctx *gin.Context) {
return
}
var desc = ctx.DefaultQuery("sort", "desc") == "desc"
var desc = ctx.DefaultQuery("order", "desc") == "desc"
preloadScopes := []func(db *gorm.DB) *gorm.DB{db.WhereRoomID(room.ID)}
scopes := []func(db *gorm.DB) *gorm.DB{}
@ -296,7 +296,7 @@ func RoomUsers(ctx *gin.Context) {
preloadScopes = append(preloadScopes, db.WhereRoomUserStatus(dbModel.RoomUserStatusActive))
}
switch ctx.DefaultQuery("order", "name") {
switch ctx.DefaultQuery("sort", "name") {
case "join":
if desc {
preloadScopes = append(preloadScopes, db.OrderByCreatedAtDesc)
@ -310,7 +310,7 @@ func RoomUsers(ctx *gin.Context) {
scopes = append(scopes, db.OrderByAsc("username"))
}
default:
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort"))
return
}

6
server/handlers/user.go
Unescape Escape View File

@ -43,7 +43,7 @@ func UserRooms(ctx *gin.Context) {
return
}
var desc = ctx.DefaultQuery("sort", "desc") == "desc"
var desc = ctx.DefaultQuery("order", "desc") == "desc"
scopes := []func(db *gorm.DB) *gorm.DB{
db.WhereCreatorID(user.ID),
@ -58,7 +58,7 @@ func UserRooms(ctx *gin.Context) {
scopes = append(scopes, db.WhereStatus(dbModel.RoomStatusBanned))
}
switch ctx.DefaultQuery("order", "name") {
switch ctx.DefaultQuery("sort", "name") {
case "createdAt":
if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc)
@ -72,7 +72,7 @@ func UserRooms(ctx *gin.Context) {
scopes = append(scopes, db.OrderByAsc("name"))
}
default:
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort"))
return
}

Write Preview
Loading…
Cancel
Save