Updates Catalog fetch query to order by id

Previoulsy, order was not defined due to which test may fail as we can't say what will be the order so now updated the query to know for sure. Signed-off-by: Shivam Mukhade <[email protected]>
tektoncd · Apr 12, 2021 · 1eed82a · 1eed82a
1 parent 2b7d0db
commit 1eed82a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/api/.env.dev b/api/.env.dev
@@ -6,11 +6,11 @@ POSTGRES_DB="hub"
 POSTGRES_USER="postgres"
 POSTGRES_PASSWORD="postgres"
 
-GH_CLIENT_ID=""
-GH_CLIENT_SECRET=""
+GH_CLIENT_ID="client-id"
+GH_CLIENT_SECRET="client-secret"
 
-JWT_SIGNING_KEY=""
-ACCESS_JWT_EXPIRES_IN=""
-REFRESH_JWT_EXPIRES_IN=""
+JWT_SIGNING_KEY="TektonHub"
+ACCESS_JWT_EXPIRES_IN="1s"
+REFRESH_JWT_EXPIRES_IN="1s"
 
 CONFIG_FILE_URL="file://../config.yaml"
diff --git a/api/v1/design/catalog.go b/api/v1/design/catalog.go
@@ -20,7 +20,7 @@ import (
 )
 
 var _ = Service("catalog", func() {
-	Description("List of catalogs")
+	Description("The catalog service provides details about catalogs.")
 
 	HTTP(func() {
 		Path("/v1")

diff --git a/api/v1/gen/catalog/service.go b/api/v1/gen/catalog/service.go
diff --git a/api/v1/gen/http/cli/hub/cli.go b/api/v1/gen/http/cli/hub/cli.go
diff --git a/api/v1/service/catalog/catalog.go b/api/v1/service/catalog/catalog.go
@@ -41,8 +41,9 @@ func (s *service) List(ctx context.Context) (*catalog.ListResult, error) {
 
 	log := s.Logger(ctx)
 	db := s.DB(ctx)
+
 	var all []model.Catalog
-	if err := db.Find(&all).Error; err != nil {
+	if err := db.Order("id").Find(&all).Error; err != nil {
 		log.Error(err)
 		return nil, internalError
 	}
@@ -52,7 +53,13 @@ func (s *service) List(ctx context.Context) (*catalog.ListResult, error) {
 	}
 
 	for _, c := range all {
-		res.Data = append(res.Data, &catalog.Catalog{ID: c.ID, Name: c.Name, Type: c.Type, URL: c.URL})
+		res.Data = append(res.Data,
+			&catalog.Catalog{
+				ID:   c.ID,
+				Name: c.Name,
+				Type: c.Type,
+				URL:  c.URL,
+			})
 	}
 
 	return res, nil