fix(rpc): fix ordering of related records

They were being ordered by IDs; they should be ordered by Names.

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-11-29 19:44:18 -08:00 committed by Steven Guikal
parent 9bfe2b07ba
commit a6ac5f0dbf

View file

@ -193,7 +193,7 @@ class RPC:
models.DependencyType.Name.label("Type"), models.DependencyType.Name.label("Type"),
models.PackageDependency.DepName.label("Name"), models.PackageDependency.DepName.label("Name"),
models.PackageDependency.DepCondition.label("Cond") models.PackageDependency.DepCondition.label("Cond")
).distinct().order_by("ID"), ).distinct().order_by("Name"),
# PackageRelation # PackageRelation
db.query( db.query(
@ -205,7 +205,7 @@ class RPC:
models.RelationType.Name.label("Type"), models.RelationType.Name.label("Type"),
models.PackageRelation.RelName.label("Name"), models.PackageRelation.RelName.label("Name"),
models.PackageRelation.RelCondition.label("Cond") models.PackageRelation.RelCondition.label("Cond")
).distinct().order_by("ID"), ).distinct().order_by("Name"),
# Groups # Groups
db.query(models.PackageGroup).join( db.query(models.PackageGroup).join(
@ -217,7 +217,7 @@ class RPC:
literal("Groups").label("Type"), literal("Groups").label("Type"),
models.Group.Name.label("Name"), models.Group.Name.label("Name"),
literal(str()).label("Cond") literal(str()).label("Cond")
).distinct().order_by("ID"), ).distinct().order_by("Name"),
# Licenses # Licenses
db.query(models.PackageLicense).join( db.query(models.PackageLicense).join(
@ -230,7 +230,7 @@ class RPC:
literal("License").label("Type"), literal("License").label("Type"),
models.License.Name.label("Name"), models.License.Name.label("Name"),
literal(str()).label("Cond") literal(str()).label("Cond")
).distinct().order_by("ID"), ).distinct().order_by("Name"),
# Keywords # Keywords
db.query(models.PackageKeyword).join( db.query(models.PackageKeyword).join(
@ -242,7 +242,7 @@ class RPC:
literal("Keywords").label("Type"), literal("Keywords").label("Type"),
models.PackageKeyword.Keyword.label("Name"), models.PackageKeyword.Keyword.label("Name"),
literal(str()).label("Cond") literal(str()).label("Cond")
).distinct().order_by("ID") ).distinct().order_by("Name")
] ]
# Union all subqueries together. # Union all subqueries together.