add sorting

Author: jsbroks

apps/workspace-engine/pkg/server/openapi/deployments/server.go

@@ -53,6 +53,27 @@ func (s *Deployments) GetDeploymentResources(c *gin.Context, workspaceId string,
 		resourceList = append(resourceList, resource)
 	}
 
+	// Sort the resourceList by resource.Name (nil-safe, ascending); if Name is the same, sort by CreatedAt
+	sort.Slice(resourceList, func(i, j int) bool {
+		if resourceList[i] == nil && resourceList[j] == nil {
+			return false
+		}
+		if resourceList[i] == nil {
+			return false
+		}
+		if resourceList[j] == nil {
+			return true
+		}
+		if resourceList[i].Name < resourceList[j].Name {
+			return true
+		}
+		if resourceList[i].Name > resourceList[j].Name {
+			return false
+		}
+		// Names are equal; compare CreatedAt
+		return resourceList[i].CreatedAt.Before(resourceList[j].CreatedAt)
+	})
+
 	// Get pagination parameters with defaults
 	limit := 50
 	if params.Limit != nil {
@@ -110,6 +131,27 @@ func (s *Deployments) ListDeployments(c *gin.Context, workspaceId string, params
 		deploymentsList = append(deploymentsList, deployment)
 	}
 
+	// Sort the deploymentsList by deployment.Name (nil-safe, ascending); if Name is the same, sort by CreatedAt
+	sort.Slice(deploymentsList, func(i, j int) bool {
+		if deploymentsList[i] == nil && deploymentsList[j] == nil {
+			return false
+		}
+		if deploymentsList[i] == nil {
+			return false
+		}
+		if deploymentsList[j] == nil {
+			return true
+		}
+		if deploymentsList[i].Name < deploymentsList[j].Name {
+			return true
+		}
+		if deploymentsList[i].Name > deploymentsList[j].Name {
+			return false
+		}
+		// Names are equal; compare CreatedAt
+		return deploymentsList[i].Id < deploymentsList[j].Id
+	})
+
 	deploymentsWithSystem := make([]*oapi.DeploymentAndSystem, 0, total)
 	for _, deployment := range deploymentsList[start:end] {
 		system, ok := ws.Systems().Get(deployment.SystemId)

apps/workspace-engine/pkg/server/openapi/environments/server.go

@@ -2,6 +2,7 @@ package environments
 
 import (
 	"net/http"
+	"sort"
 
 	"github.com/gin-gonic/gin"
 
@@ -60,6 +61,26 @@ func (s *Environments) ListEnvironments(c *gin.Context, workspaceId string, para
 		environmentsList = append(environmentsList, environment)
 	}
 
+	sort.Slice(environmentsList, func(i, j int) bool {
+		if environmentsList[i] == nil && environmentsList[j] == nil {
+			return false
+		}
+		if environmentsList[i] == nil {
+			return false
+		}
+		if environmentsList[j] == nil {
+			return true
+		}
+		if environmentsList[i].Name < environmentsList[j].Name {
+			return true
+		}
+		if environmentsList[i].Name > environmentsList[j].Name {
+			return false
+		}
+		// Names are equal; compare Id
+		return environmentsList[i].Id < environmentsList[j].Id
+	})
+
 	c.JSON(http.StatusOK, gin.H{
 		"total":  total,
 		"offset": offset,
@@ -90,6 +111,26 @@ func (s *Environments) GetEnvironmentResources(c *gin.Context, workspaceId strin
 		resourceList = append(resourceList, resource)
 	}
 
+	sort.Slice(resourceList, func(i, j int) bool {
+		if resourceList[i] == nil && resourceList[j] == nil {
+			return false
+		}
+		if resourceList[i] == nil {
+			return false
+		}
+		if resourceList[j] == nil {
+			return true
+		}
+		if resourceList[i].Name < resourceList[j].Name {
+			return true
+		}
+		if resourceList[i].Name > resourceList[j].Name {
+			return false
+		}
+		// Names are equal; compare Id
+		return resourceList[i].Id < resourceList[j].Id
+	})
+
 	// Get pagination parameters with defaults
 	limit := 50
 	if params.Limit != nil {
@@ -103,14 +144,8 @@ func (s *Environments) GetEnvironmentResources(c *gin.Context, workspaceId strin
 	total := len(resourceList)
 
 	// Apply pagination
-	start := offset
-	if start > total {
-		start = total
-	}
-	end := start + limit
-	if end > total {
-		end = total
-	}
+	start := min(offset, total)
+	end := min(start + limit, total)
 	paginatedResources := resourceList[start:end]
 
 	c.JSON(http.StatusOK, gin.H{