Merge branch '135-sorted-clone-list' into 'master'

agneum · agneum · commit ef081b3692ec · 2020-06-23T14:16:01.000Z
feat: return the list of clones descend ordered by creation time (the newest is the 1st) (#135) Closes #135 See merge request postgres-ai/database-lab!122
diff --git a/pkg/services/cloning/mode_base.go b/pkg/services/cloning/mode_base.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -336,7 +337,7 @@ func (c *baseCloning) GetSnapshots() ([]models.Snapshot, error) {
 	return snapshots, nil
 }
 
-// GetClones returns all clones.
+// GetClones returns the list of clones descend ordered by creation time.
 func (c *baseCloning) GetClones() []*models.Clone {
 	clones := make([]*models.Clone, 0, c.lenClones())
 
@@ -346,6 +347,10 @@ func (c *baseCloning) GetClones() []*models.Clone {
 	}
 	c.cloneMutex.RUnlock()
 
+	sort.Slice(clones, func(i, j int) bool {
+		return clones[i].CreatedAt > clones[j].CreatedAt
+	})
+
 	return clones
 }
 
diff --git a/pkg/services/cloning/mode_base_test.go b/pkg/services/cloning/mode_base_test.go
@@ -47,6 +47,27 @@ func (s *BaseCloningSuite) TestFindWrapper() {
 	assert.Equal(s.T(), CloneWrapper{clone: &models.Clone{ID: "testCloneID"}}, *wrapper)
 }
 
+func (s *BaseCloningSuite) TestCloneList() {
+	clone1 := &models.Clone{CreatedAt: "2020-02-20 01:23:45 UTC"}
+	clone2 := &models.Clone{CreatedAt: "2020-06-23 10:31:27 UTC"}
+	clone3 := &models.Clone{CreatedAt: "2020-05-20 00:43:21 UTC"}
+
+	s.cloning.setWrapper("testCloneID1", &CloneWrapper{clone: clone1})
+	s.cloning.setWrapper("testCloneID2", &CloneWrapper{clone: clone2})
+	s.cloning.setWrapper("testCloneID3", &CloneWrapper{clone: clone3})
+
+	list := s.cloning.GetClones()
+
+	assert.Equal(s.T(), 3, len(list))
+
+	// Check clone order.
+	assert.Equal(s.T(), []*models.Clone{
+		{CreatedAt: "2020-06-23 10:31:27 UTC"},
+		{CreatedAt: "2020-05-20 00:43:21 UTC"},
+		{CreatedAt: "2020-02-20 01:23:45 UTC"},
+	}, list)
+}
+
 func (s *BaseCloningSuite) TestUpdateStatus() {
 	s.cloning.setWrapper("testCloneID", &CloneWrapper{clone: &models.Clone{Status: models.Status{
 		Code:    models.StatusCreating,
