diff --git a/internal/db/db.go b/internal/db/db.go index b36df79..445a94e 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -87,10 +87,18 @@ func OrderByCreatedAtAsc(db *gorm.DB) *gorm.DB { 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 { 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 { return db.Order("id asc") } diff --git a/server/handlers/admin.go b/server/handlers/admin.go index 5b5bc5c..d072ded 100644 --- a/server/handlers/admin.go +++ b/server/handlers/admin.go @@ -243,9 +243,9 @@ func AdminGetRoomMembers(ctx *gin.Context) { switch ctx.DefaultQuery("sort", "name") { case "join": if desc { - scopes = append(scopes, db.OrderByCreatedAtDesc) + scopes = append(scopes, db.OrderByUsersCreatedAtDesc) } else { - scopes = append(scopes, db.OrderByCreatedAtAsc) + scopes = append(scopes, db.OrderByUsersCreatedAtAsc) } case "name": if desc { diff --git a/server/handlers/member.go b/server/handlers/member.go index 93a2d1b..c055422 100644 --- a/server/handlers/member.go +++ b/server/handlers/member.go @@ -40,9 +40,9 @@ func RoomMembers(ctx *gin.Context) { switch ctx.DefaultQuery("sort", "name") { case "join": if desc { - scopes = append(scopes, db.OrderByCreatedAtDesc) + scopes = append(scopes, db.OrderByUsersCreatedAtDesc) } else { - scopes = append(scopes, db.OrderByCreatedAtAsc) + scopes = append(scopes, db.OrderByUsersCreatedAtAsc) } case "name": if desc { @@ -139,9 +139,9 @@ func RoomAdminMembers(ctx *gin.Context) { switch ctx.DefaultQuery("sort", "name") { case "join": if desc { - scopes = append(scopes, db.OrderByCreatedAtDesc) + scopes = append(scopes, db.OrderByUsersCreatedAtDesc) } else { - scopes = append(scopes, db.OrderByCreatedAtAsc) + scopes = append(scopes, db.OrderByUsersCreatedAtAsc) } case "name": if desc {