fix(api): order bookmarks alphabetically (#3783)

Signed-off-by: Benjamin Coenen <benjamin.coenen@corp.ovh.com>
ovh · Dec 31, 2018 · 11ec60c · 11ec60c
1 parent aadf72d
commit 11ec60c
Showing 1 changed file with 22 additions and 21 deletions.
diff --git a/engine/api/bookmark/bookmark.go b/engine/api/bookmark/bookmark.go
@@ -11,27 +11,28 @@ import (
 // LoadAll returns all bookmarks with icons and their description
 func LoadAll(db gorp.SqlExecutor, u *sdk.User) ([]sdk.Bookmark, error) {
 	var data []sdk.Bookmark
-	query := `
-	(
-		SELECT DISTINCT
-			project.projectkey AS key, project.name AS project_name, project.description, '' AS workflow_name, project.description, project.icon,
-			true AS favorite,
-			'project' AS type
-		FROM project
-		JOIN project_favorite ON project.id = project_favorite.project_id AND project_favorite.user_id = $1
-		ORDER BY project.name
-	)
-	UNION
-	(
-		SELECT DISTINCT
-			project.projectkey AS key, project.name AS project_name, workflow.description, workflow.name AS workflow_name, workflow.description, workflow.icon,
-			true AS favorite,
-			'workflow' AS type
-		FROM project
-		JOIN workflow ON workflow.project_id = project.id
-		JOIN workflow_favorite ON workflow.id = workflow_favorite.workflow_id AND workflow_favorite.user_id = $1
-		ORDER BY project.name
-	)
+	query := `SELECT * FROM (
+		(
+			SELECT DISTINCT
+				project.projectkey AS key, project.name AS project_name, project.description, '' AS workflow_name, project.description, project.icon,
+				true AS favorite,
+				'project' AS type
+			FROM project
+			JOIN project_favorite ON project.id = project_favorite.project_id AND project_favorite.user_id = $1
+			ORDER BY project.name
+		)
+		UNION
+		(
+			SELECT DISTINCT
+				project.projectkey AS key, project.name AS project_name, workflow.description, workflow.name AS workflow_name, workflow.description, workflow.icon,
+				true AS favorite,
+				'workflow' AS type
+			FROM project
+			JOIN workflow ON workflow.project_id = project.id
+			JOIN workflow_favorite ON workflow.id = workflow_favorite.workflow_id AND workflow_favorite.user_id = $1
+			ORDER BY workflow_name
+		)
+	) AS sub ORDER BY sub.workflow_name
 	`
 	if u == nil {
 		u = &sdk.User{}