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

refactor(spx-backend): use model ID as ORDER BY tie-breaker #1014

Merged
merged 1 commit into from
Oct 23, 2024
Merged

refactor(spx-backend): use model ID as ORDER BY tie-breaker #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions spx-backend/internal/controller/asset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,16 @@ func (ctrl *Controller) ListAssets(ctx context.Context, params *ListAssetsParams
if params.Visibility != nil {
query = query.Where("asset.visibility = ?", model.ParseVisibility(*params.Visibility))
}
var queryOrderByColumn string
switch params.OrderBy {
case ListAssetsOrderByCreatedAt:
query = query.Order(fmt.Sprintf("asset.created_at %s", params.SortOrder))
case ListAssetsOrderByUpdatedAt:
query = query.Order(fmt.Sprintf("asset.updated_at %s", params.SortOrder))
queryOrderByColumn = "asset.updated_at"
}
if queryOrderByColumn == "" {
queryOrderByColumn = "asset.created_at"
}
query = query.Order(fmt.Sprintf("%s %s, asset.id", queryOrderByColumn, params.SortOrder))

var total int64
if err := query.Count(&total).Error; err != nil {
Expand Down
2 changes: 1 addition & 1 deletion spx-backend/internal/controller/asset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ func TestControllerListAssets(t *testing.T) {

dbMockStmt = ctrl.db.Session(&gorm.Session{DryRun: true}).
Where("asset.visibility = ?", model.VisibilityPublic).
Order("asset.created_at desc").
Order("asset.created_at desc, asset.id").
Limit(params.Pagination.Size).
Find(&[]model.Asset{}).
Statement
Expand Down
28 changes: 12 additions & 16 deletions spx-backend/internal/controller/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,36 +424,32 @@ func (ctrl *Controller) ListProjects(ctx context.Context, params *ListProjectsPa
Where("user_relationship.user_id = ?", mUser.ID).
Where("user_relationship.followed_at IS NOT NULL")
}
var queryOrderByColumn string
switch params.OrderBy {
case ListProjectsOrderByCreatedAt:
query = query.Order(fmt.Sprintf("project.created_at %s", params.SortOrder))
case ListProjectsOrderByUpdatedAt:
query = query.Order(fmt.Sprintf("project.updated_at %s", params.SortOrder))
queryOrderByColumn = "project.updated_at"
case ListProjectsOrderByLikeCount:
query = query.Order(fmt.Sprintf("project.like_count %s", params.SortOrder))
queryOrderByColumn = "project.like_count"
case ListProjectsOrderByRemixCount:
query = query.Order(fmt.Sprintf("project.remix_count %s", params.SortOrder))
queryOrderByColumn = "project.remix_count"
case ListProjectsOrderByRecentLikeCount:
if params.LikesReceivedAfter == nil {
query = query.Order(fmt.Sprintf("project.like_count %s", params.SortOrder))
queryOrderByColumn = "project.like_count"
break
}
query = query.
Joins("JOIN user_project_relationship AS recent_likes_relationship ON recent_likes_relationship.project_id = project.id").
Where("recent_likes_relationship.liked_at > ?", *params.LikesReceivedAfter).
Group("project.id").
Order("COUNT(recent_likes_relationship.id) " + string(params.SortOrder))
queryOrderByColumn = "COUNT(likes_after_relationship.id)"
case ListProjectsOrderByRecentRemixCount:
if params.RemixesReceivedAfter == nil {
query = query.Order(fmt.Sprintf("project.remix_count %s", params.SortOrder))
queryOrderByColumn = "project.remix_count"
break
}
query = query.
Joins("JOIN project AS recent_remixed_project ON recent_remixed_project.remixed_from_release_id = project_release.id").
Where("recent_remixed_project.created_at > ?", *params.RemixesReceivedAfter).
Group("project.id").
Order("COUNT(recent_remixed_project.id) " + string(params.SortOrder))
queryOrderByColumn = "COUNT(remixed_project.id)"
}
if queryOrderByColumn == "" {
queryOrderByColumn = "project.created_at"
}
query = query.Order(fmt.Sprintf("%s %s, project.id", queryOrderByColumn, params.SortOrder))

var total int64
if err := query.Count(&total).Error; err != nil {
Expand Down
10 changes: 7 additions & 3 deletions spx-backend/internal/controller/project_release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,18 @@ func (ctrl *Controller) ListProjectReleases(ctx context.Context, params *ListPro
Where("project_owner.username = ?", projectOwnerUsername).
Where("project.name = ?", projectName)
}
var queryOrderByColumn string
switch params.OrderBy {
case ListProjectReleasesOrderByCreatedAt:
query = query.Order(fmt.Sprintf("project_release.created_at %s", params.SortOrder))
case ListProjectReleasesOrderByUpdatedAt:
query = query.Order(fmt.Sprintf("project_release.updated_at %s", params.SortOrder))
queryOrderByColumn = "project_release.updated_at"
case ListProjectReleasesOrderByRemixCount:
query = query.Order(fmt.Sprintf("project_release.remix_count %s", params.SortOrder))
queryOrderByColumn = "project_release.remix_count"
}
if queryOrderByColumn == "" {
queryOrderByColumn = "project_release.created_at"
}
query = query.Order(fmt.Sprintf("%s %s, project_release.id", queryOrderByColumn, params.SortOrder))

var total int64
if err := query.Count(&total).Error; err != nil {
Expand Down
14 changes: 7 additions & 7 deletions spx-backend/internal/controller/project_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ func TestControllerListProjects(t *testing.T) {

dbMockStmt = ctrl.db.Session(&gorm.Session{DryRun: true}).
Where("project.visibility = ?", model.VisibilityPublic).
Order("project.created_at desc").
Order("project.created_at desc, project.id").
Limit(2).
Find(&[]model.Project{}).
Statement
Expand Down Expand Up @@ -778,7 +778,7 @@ func TestControllerListProjects(t *testing.T) {
dbMockStmt = ctrl.db.Session(&gorm.Session{DryRun: true}).
Joins("JOIN user ON user.id = project.owner_id").
Where("user.username = ?", *params.Owner).
Order("project.created_at desc").
Order("project.created_at desc, project.id").
Limit(params.Pagination.Size).
Find(&[]model.Project{}).
Statement
Expand Down Expand Up @@ -843,7 +843,7 @@ func TestControllerListProjects(t *testing.T) {
dbMockStmt = ctrl.db.Session(&gorm.Session{DryRun: true}).
Where("project.name LIKE ?", "%"+*params.Keyword+"%").
Where("project.visibility = ?", model.VisibilityPublic).
Order("project.created_at desc").
Order("project.created_at desc, project.id").
Limit(params.Pagination.Size).
Find(&[]model.Project{}).
Statement
Expand Down Expand Up @@ -914,7 +914,7 @@ func TestControllerListProjects(t *testing.T) {
Where("project.visibility = ?", model.VisibilityPublic).
Where("liker.username = ?", *params.Liker).
Where("liker_relationship.liked_at IS NOT NULL").
Order("project.created_at desc").
Order("project.created_at desc, project.id").
Limit(params.Pagination.Size).
Find(&[]model.Project{}).
Statement
Expand Down Expand Up @@ -984,7 +984,7 @@ func TestControllerListProjects(t *testing.T) {

dbMockStmt = ctrl.db.Session(&gorm.Session{DryRun: true}).
Where("project.visibility = ?", model.VisibilityPublic).
Order("project.like_count desc").
Order("project.like_count desc, project.id").
Limit(params.Pagination.Size).
Find(&[]model.Project{}).
Statement
Expand Down Expand Up @@ -1059,7 +1059,7 @@ func TestControllerListProjects(t *testing.T) {

dbMockStmt = ctrl.db.Session(&gorm.Session{DryRun: true}).
Where("project.visibility = ?", model.VisibilityPublic).
Order("project.created_at desc").
Order("project.created_at desc, project.id").
Limit(params.Pagination.Size).
Find(&[]model.Project{}).
Statement
Expand Down Expand Up @@ -1120,7 +1120,7 @@ func TestControllerListProjects(t *testing.T) {
Where("remixed_from_user.username = ?", "original_user").
Where("remixed_from_project.name = ?", "original_project").
Where("project.visibility = ?", model.VisibilityPublic).
Order("project.created_at desc").
Order("project.created_at desc, project.id").
Limit(params.Pagination.Size).
Find(&[]model.Project{}).
Statement
Expand Down
14 changes: 8 additions & 6 deletions spx-backend/internal/controller/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,21 +158,23 @@ func (ctrl *Controller) ListUsers(ctx context.Context, params *ListUsersParams)
Joins("JOIN user_relationship AS followee_relationship ON followee_relationship.target_user_id = followee.id AND followee_relationship.user_id = user.id").
Where("followee_relationship.followed_at IS NOT NULL")
}
var queryOrderByColumn string
switch params.OrderBy {
case ListUsersOrderByCreatedAt:
query = query.Order(fmt.Sprintf("user.created_at %s", params.SortOrder))
case ListUsersOrderByUpdatedAt:
query = query.Order(fmt.Sprintf("user.updated_at %s", params.SortOrder))
queryOrderByColumn = "user.updated_at"
case ListUsersOrderByFollowedAt:
switch {
case params.Follower != nil:
query = query.Order(fmt.Sprintf("follower_relationship.followed_at %s", params.SortOrder))
queryOrderByColumn = "follower_relationship.followed_at"
case params.Followee != nil:
query = query.Order(fmt.Sprintf("followee_relationship.followed_at %s", params.SortOrder))
default:
query = query.Order(fmt.Sprintf("user.created_at %s", params.SortOrder))
queryOrderByColumn = "followee_relationship.followed_at"
}
}
if queryOrderByColumn == "" {
queryOrderByColumn = "user.created_at"
}
query = query.Order(fmt.Sprintf("%s %s, user.id", queryOrderByColumn, params.SortOrder))

var total int64
if err := query.Count(&total).Error; err != nil {
Expand Down
8 changes: 4 additions & 4 deletions spx-backend/internal/controller/user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func TestControllerListUsers(t *testing.T) {
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(2))

dbMockStmt = ctrl.db.Session(&gorm.Session{DryRun: true}).
Order("user.created_at desc").
Order("user.created_at desc, user.id").
Limit(2).
Find(&[]model.User{}).
Statement
Expand Down Expand Up @@ -276,7 +276,7 @@ func TestControllerListUsers(t *testing.T) {
Joins("JOIN user AS follower ON follower.username = ?", *params.Follower).
Joins("JOIN user_relationship AS follower_relationship ON follower_relationship.user_id = follower.id AND follower_relationship.target_user_id = user.id").
Where("follower_relationship.followed_at IS NOT NULL").
Order("user.created_at desc").
Order("user.created_at desc, user.id").
Limit(params.Pagination.Size).
Find(&[]model.User{}).
Statement
Expand Down Expand Up @@ -326,7 +326,7 @@ func TestControllerListUsers(t *testing.T) {
Joins("JOIN user AS followee ON followee.username = ?", *params.Followee).
Joins("JOIN user_relationship AS followee_relationship ON followee_relationship.target_user_id = followee.id AND followee_relationship.user_id = user.id").
Where("followee_relationship.followed_at IS NOT NULL").
Order("user.created_at desc").
Order("user.created_at desc, user.id").
Limit(params.Pagination.Size).
Find(&[]model.User{}).
Statement
Expand Down Expand Up @@ -381,7 +381,7 @@ func TestControllerListUsers(t *testing.T) {
Joins("JOIN user AS follower ON follower.username = ?", *params.Follower).
Joins("JOIN user_relationship AS follower_relationship ON follower_relationship.user_id = follower.id AND follower_relationship.target_user_id = user.id").
Where("follower_relationship.followed_at IS NOT NULL").
Order("follower_relationship.followed_at desc").
Order("follower_relationship.followed_at desc, user.id").
Limit(params.Pagination.Size).
Find(&[]model.User{}).
Statement
Expand Down
Loading