From a06d3e1a61a8ce1d6f3cac41abd4e870e4b07a3f Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Tue, 11 Apr 2023 09:33:27 +0200
Subject: [PATCH] Stable sort order for DB lists (#1702)

---
 server/store/datastore/registry.go | 2 +-
 server/store/datastore/secret.go   | 2 +-
 server/store/datastore/user.go     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/store/datastore/registry.go b/server/store/datastore/registry.go
index 915455c57..b7da85226 100644
--- a/server/store/datastore/registry.go
+++ b/server/store/datastore/registry.go
@@ -28,7 +28,7 @@ func (s storage) RegistryFind(repo *model.Repo, addr string) (*model.Registry, e
 
 func (s storage) RegistryList(repo *model.Repo) ([]*model.Registry, error) {
 	regs := make([]*model.Registry, 0, perPage)
-	return regs, s.engine.Where("registry_repo_id = ?", repo.ID).Find(&regs)
+	return regs, s.engine.OrderBy("registry_id").Where("registry_repo_id = ?", repo.ID).Find(&regs)
 }
 
 func (s storage) RegistryCreate(registry *model.Registry) error {
diff --git a/server/store/datastore/secret.go b/server/store/datastore/secret.go
index 525dbdf2b..7a412d1f7 100644
--- a/server/store/datastore/secret.go
+++ b/server/store/datastore/secret.go
@@ -71,7 +71,7 @@ func (s storage) OrgSecretFind(owner, name string) (*model.Secret, error) {
 
 func (s storage) OrgSecretList(owner string) ([]*model.Secret, error) {
 	secrets := make([]*model.Secret, 0, perPage)
-	return secrets, s.engine.Where("secret_owner = ?", owner).Find(&secrets)
+	return secrets, s.engine.Where("secret_owner = ?", owner).OrderBy(orderSecretsBy).Find(&secrets)
 }
 
 func (s storage) GlobalSecretFind(name string) (*model.Secret, error) {
diff --git a/server/store/datastore/user.go b/server/store/datastore/user.go
index 230dc443e..d906f6c51 100644
--- a/server/store/datastore/user.go
+++ b/server/store/datastore/user.go
@@ -30,7 +30,7 @@ func (s storage) GetUserLogin(login string) (*model.User, error) {
 
 func (s storage) GetUserList() ([]*model.User, error) {
 	users := make([]*model.User, 0, 10)
-	return users, s.engine.Find(&users)
+	return users, s.engine.OrderBy("user_id").Find(&users)
 }
 
 func (s storage) GetUserCount() (int64, error) {