Merge branch '304-latest-snapshot-selection' into 'master'

fix: wrong selection of the latest snapshot (#304)

# Description
- fix wrong selection of the latest snapshot: 
  - change incorrect sign on comparing `dataStateAt` values
  - improve test cases
- extend structs of the clone list view for CLI

Closes #304

See merge request postgres-ai/database-lab!359

Author: agneum

cmd/cli/commands/clone/actions.go

@@ -40,14 +40,16 @@ func list(cliCtx *cli.Context) error {
 	defer func() { _ = body.Close() }()
 
 	viewCloneList := &models.CloneListView{
-		Clones: make([]*models.CloneView, 0),
+		Cloning: models.CloningView{
+			Clones: make([]*models.CloneView, 0),
+		},
 	}
 
 	if err := json.NewDecoder(body).Decode(&viewCloneList); err != nil {
 		return err
 	}
 
-	commandResponse, err := json.MarshalIndent(viewCloneList.Clones, "", "    ")
+	commandResponse, err := json.MarshalIndent(viewCloneList.Cloning.Clones, "", "    ")
 	if err != nil {
 		return err
 	}

pkg/models/instance_status.go

@@ -55,8 +55,13 @@ type CloneList struct {
 	Cloning Cloning `json:"cloning"`
 }
 
-// CloneListView represents a list of clone views.
+// CloneListView represents cloning process views.
 type CloneListView struct {
+	Cloning CloningView `json:"cloning"`
+}
+
+// CloningView represents a list of clone views.
+type CloningView struct {
 	Clones []*CloneView `json:"clones"`
 }
 

pkg/services/cloning/snapshots.go

@@ -71,7 +71,7 @@ func (c *Base) addSnapshot(snapshot *models.Snapshot) {
 	c.snapshotBox.items[snapshot.ID] = snapshot
 
 	if c.snapshotBox.latestSnapshot == nil ||
-		c.snapshotBox.latestSnapshot.DataStateAt == "" || c.snapshotBox.latestSnapshot.DataStateAt > snapshot.DataStateAt {
+		c.snapshotBox.latestSnapshot.DataStateAt == "" || c.snapshotBox.latestSnapshot.DataStateAt < snapshot.DataStateAt {
 		c.snapshotBox.latestSnapshot = snapshot
 	}
 

pkg/services/cloning/snapshots_test.go

@@ -7,7 +7,6 @@ package cloning
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
@@ -28,17 +27,17 @@ func (s *BaseCloningSuite) TestLatestSnapshot() {
 		DataStateAt: "2020-02-20 00:00:00",
 	}
 
-	assert.Equal(s.T(), 0, len(s.cloning.snapshotBox.items))
+	require.Equal(s.T(), 0, len(s.cloning.snapshotBox.items))
 	latestSnapshot, err := s.cloning.getLatestSnapshot()
-	assert.Nil(s.T(), latestSnapshot)
-	assert.EqualError(s.T(), err, "no snapshot found")
+	require.Nil(s.T(), latestSnapshot)
+	require.EqualError(s.T(), err, "no snapshot found")
 
 	s.cloning.addSnapshot(snapshot1)
 	s.cloning.addSnapshot(snapshot2)
 
 	latestSnapshot, err = s.cloning.getLatestSnapshot()
 	require.NoError(s.T(), err)
-	assert.Equal(s.T(), latestSnapshot, snapshot1)
+	require.Equal(s.T(), latestSnapshot, snapshot2)
 }
 
 func (s *BaseCloningSuite) TestSnapshotByID() {
@@ -56,28 +55,28 @@ func (s *BaseCloningSuite) TestSnapshotByID() {
 		DataStateAt: "2020-02-20 00:00:00",
 	}
 
-	assert.Equal(s.T(), 0, len(s.cloning.snapshotBox.items))
+	require.Equal(s.T(), 0, len(s.cloning.snapshotBox.items))
 	latestSnapshot, err := s.cloning.getLatestSnapshot()
-	assert.Nil(s.T(), latestSnapshot)
-	assert.EqualError(s.T(), err, "no snapshot found")
+	require.Nil(s.T(), latestSnapshot)
+	require.EqualError(s.T(), err, "no snapshot found")
 
 	s.cloning.addSnapshot(snapshot1)
-	assert.Equal(s.T(), 1, len(s.cloning.snapshotBox.items))
-	assert.Equal(s.T(), "TestSnapshotID1", s.cloning.snapshotBox.items[snapshot1.ID].ID)
+	require.Equal(s.T(), 1, len(s.cloning.snapshotBox.items))
+	require.Equal(s.T(), "TestSnapshotID1", s.cloning.snapshotBox.items[snapshot1.ID].ID)
 
 	s.cloning.addSnapshot(snapshot2)
-	assert.Equal(s.T(), 2, len(s.cloning.snapshotBox.items))
-	assert.Equal(s.T(), "TestSnapshotID2", s.cloning.snapshotBox.items[snapshot2.ID].ID)
+	require.Equal(s.T(), 2, len(s.cloning.snapshotBox.items))
+	require.Equal(s.T(), "TestSnapshotID2", s.cloning.snapshotBox.items[snapshot2.ID].ID)
 
 	latestSnapshot, err = s.cloning.getSnapshotByID("TestSnapshotID2")
 	require.NoError(s.T(), err)
-	assert.Equal(s.T(), latestSnapshot, snapshot2)
+	require.Equal(s.T(), latestSnapshot, snapshot2)
 
 	s.cloning.resetSnapshots(make(map[string]*models.Snapshot))
-	assert.Equal(s.T(), 0, len(s.cloning.snapshotBox.items))
+	require.Equal(s.T(), 0, len(s.cloning.snapshotBox.items))
 	latestSnapshot, err = s.cloning.getLatestSnapshot()
-	assert.Nil(s.T(), latestSnapshot)
-	assert.EqualError(s.T(), err, "no snapshot found")
+	require.Nil(s.T(), latestSnapshot)
+	require.EqualError(s.T(), err, "no snapshot found")
 }
 
 func TestCloneCounter(t *testing.T) {
@@ -91,15 +90,15 @@ func TestCloneCounter(t *testing.T) {
 
 	snapshot, err := c.getSnapshotByID("testSnapshotID")
 	require.Nil(t, err)
-	assert.Equal(t, 0, snapshot.NumClones)
+	require.Equal(t, 0, snapshot.NumClones)
 
 	c.incrementCloneNumber("testSnapshotID")
 	snapshot, err = c.getSnapshotByID("testSnapshotID")
 	require.Nil(t, err)
-	assert.Equal(t, 1, snapshot.NumClones)
+	require.Equal(t, 1, snapshot.NumClones)
 
 	c.decrementCloneNumber("testSnapshotID")
 	snapshot, err = c.getSnapshotByID("testSnapshotID")
 	require.Nil(t, err)
-	assert.Equal(t, 0, snapshot.NumClones)
+	require.Equal(t, 0, snapshot.NumClones)
 }