Skip to content

Commit

Permalink
Fix: sord and order
Browse files Browse the repository at this point in the history
  • Loading branch information
@zijiren233
zijiren233 committed Nov 17, 2023
1 parent 4346e4f commit 957e970
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
24 changes: 12 additions & 12 deletions server/handlers/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{}

Expand All @@ -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)
Expand All @@ -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
}

Expand Down Expand Up @@ -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)
Expand All @@ -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
}

Expand Down Expand Up @@ -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{}

Expand All @@ -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)
Expand All @@ -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
}

Expand Down Expand Up @@ -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),
Expand All @@ -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)
Expand All @@ -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
}

Expand Down
12 changes: 6 additions & 6 deletions server/handlers/room.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
}

Expand Down Expand Up @@ -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{}
Expand All @@ -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)
Expand All @@ -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
}

Expand Down
6 changes: 3 additions & 3 deletions server/handlers/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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)
Expand All @@ -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
}

Expand Down

0 comments on commit 957e970

Please sign in to comment.