Fix: ambiguous column name: created_at in room members list

pull/134/head
zijiren233 11 months ago
parent eeba3232b7
commit 2019ccd415

@ -87,10 +87,18 @@ func OrderByCreatedAtAsc(db *gorm.DB) *gorm.DB {
return db.Order("created_at asc") return db.Order("created_at asc")
} }
func OrderByUsersCreatedAtAsc(db *gorm.DB) *gorm.DB {
return db.Order("users.created_at asc")
}
func OrderByCreatedAtDesc(db *gorm.DB) *gorm.DB { func OrderByCreatedAtDesc(db *gorm.DB) *gorm.DB {
return db.Order("created_at desc") return db.Order("created_at desc")
} }
func OrderByUsersCreatedAtDesc(db *gorm.DB) *gorm.DB {
return db.Order("users.created_at desc")
}
func OrderByIDAsc(db *gorm.DB) *gorm.DB { func OrderByIDAsc(db *gorm.DB) *gorm.DB {
return db.Order("id asc") return db.Order("id asc")
} }

@ -243,9 +243,9 @@ func AdminGetRoomMembers(ctx *gin.Context) {
switch ctx.DefaultQuery("sort", "name") { switch ctx.DefaultQuery("sort", "name") {
case "join": case "join":
if desc { if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc) scopes = append(scopes, db.OrderByUsersCreatedAtDesc)
} else { } else {
scopes = append(scopes, db.OrderByCreatedAtAsc) scopes = append(scopes, db.OrderByUsersCreatedAtAsc)
} }
case "name": case "name":
if desc { if desc {

@ -40,9 +40,9 @@ func RoomMembers(ctx *gin.Context) {
switch ctx.DefaultQuery("sort", "name") { switch ctx.DefaultQuery("sort", "name") {
case "join": case "join":
if desc { if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc) scopes = append(scopes, db.OrderByUsersCreatedAtDesc)
} else { } else {
scopes = append(scopes, db.OrderByCreatedAtAsc) scopes = append(scopes, db.OrderByUsersCreatedAtAsc)
} }
case "name": case "name":
if desc { if desc {
@ -139,9 +139,9 @@ func RoomAdminMembers(ctx *gin.Context) {
switch ctx.DefaultQuery("sort", "name") { switch ctx.DefaultQuery("sort", "name") {
case "join": case "join":
if desc { if desc {
scopes = append(scopes, db.OrderByCreatedAtDesc) scopes = append(scopes, db.OrderByUsersCreatedAtDesc)
} else { } else {
scopes = append(scopes, db.OrderByCreatedAtAsc) scopes = append(scopes, db.OrderByUsersCreatedAtAsc)
} }
case "name": case "name":
if desc { if desc {

Loading…
Cancel
Save