moved common logic of changesItem

Author: mmelograno

splitio/proxy/storage/persistent/common.go

@@ -0,0 +1,38 @@
+package persistent
+
+// ChangesItem represents an changesItem service response
+type ChangesItem struct {
+	ChangeNumber int64  `json:"changeNumber"`
+	Name         string `json:"name"`
+	Status       string `json:"status"`
+	JSON         string
+}
+
+// ChangesItem Sortable list
+type ChangesItems struct {
+	items []ChangesItem
+}
+
+func NewChangesItems(size int) ChangesItems {
+	return ChangesItems{
+		items: make([]ChangesItem, 0, size),
+	}
+}
+
+func (c *ChangesItems) Append(item ChangesItem) {
+	c.items = append(c.items, item)
+}
+
+func (c *ChangesItems) Len() int {
+	return len(c.items)
+}
+
+func (c *ChangesItems) Less(i, j int) bool {
+	return c.items[i].ChangeNumber > c.items[j].ChangeNumber
+}
+
+func (c *ChangesItems) Swap(i, j int) {
+	c.items[i], c.items[j] = c.items[j], c.items[i]
+}
+
+//----------------------------------------------------

splitio/proxy/storage/persistent/common_test.go

@@ -0,0 +1,45 @@
+package persistent
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestChangesItem(t *testing.T) {
+	item := ChangesItem{
+		ChangeNumber: 123,
+		Name:         "test_split",
+		Status:       "ACTIVE",
+		JSON:         `{"name":"test_split","status":"ACTIVE"}`,
+	}
+
+	items := NewChangesItems(2)
+	items.Append(item)
+	items.Append(ChangesItem{
+		ChangeNumber: 124,
+		Name:         "another_split",
+		Status:       "ARCHIVED",
+		JSON:         `{"name":"another_split","status":"ARCHIVED"}`,
+	})
+
+	assert.Equal(t, 2, items.Len(), "Expected length to be 2")
+	assert.Equal(t, "test_split", items.items[0].Name)
+	assert.Equal(t, int64(123), items.items[0].ChangeNumber)
+	assert.Equal(t, "ACTIVE", items.items[0].Status)
+	assert.Equal(t, `{"name":"test_split","status":"ACTIVE"}`, items.items[0].JSON)
+	assert.Equal(t, "another_split", items.items[1].Name)
+	assert.Equal(t, int64(124), items.items[1].ChangeNumber)
+	assert.Equal(t, "ARCHIVED", items.items[1].Status)
+	assert.Equal(t, `{"name":"another_split","status":"ARCHIVED"}`, items.items[1].JSON)
+	assert.True(t, items.Less(1, 0), "Expected item at index 1 to be less than item at index 0")
+	items.Swap(0, 1)
+	assert.Equal(t, "another_split", items.items[0].Name)
+	assert.Equal(t, int64(124), items.items[0].ChangeNumber)
+	assert.Equal(t, "ARCHIVED", items.items[0].Status)
+	assert.Equal(t, `{"name":"another_split","status":"ARCHIVED"}`, items.items[0].JSON)
+	assert.Equal(t, "test_split", items.items[1].Name)
+	assert.Equal(t, int64(123), items.items[1].ChangeNumber)
+	assert.Equal(t, "ACTIVE", items.items[1].Status)
+	assert.Equal(t, `{"name":"test_split","status":"ACTIVE"}`, items.items[1].JSON)
+}

splitio/proxy/storage/persistent/rulebasedsegments.go

@@ -0,0 +1,3 @@
+package persistent
+
+const ruleBasedSegmentsChangesCollectionName = "RULE_BASED_SEGMENTS_CHANGES_COLLECTION"

splitio/proxy/storage/persistent/splits.go

@@ -12,31 +12,6 @@ import (
 
 const splitChangesCollectionName = "SPLIT_CHANGES_COLLECTION"
 
-// SplitChangesItem represents an SplitChanges service response
-type SplitChangesItem struct {
-	ChangeNumber int64  `json:"changeNumber"`
-	Name         string `json:"name"`
-	Status       string `json:"status"`
-	JSON         string
-}
-
-// SplitsChangesItems Sortable list
-type SplitsChangesItems []SplitChangesItem
-
-func (slice SplitsChangesItems) Len() int {
-	return len(slice)
-}
-
-func (slice SplitsChangesItems) Less(i, j int) bool {
-	return slice[i].ChangeNumber > slice[j].ChangeNumber
-}
-
-func (slice SplitsChangesItems) Swap(i, j int) {
-	slice[i], slice[j] = slice[j], slice[i]
-}
-
-//----------------------------------------------------
-
 // SplitChangesCollection represents a collection of SplitChangesItem
 type SplitChangesCollection struct {
 	collection   CollectionWrapper
@@ -54,15 +29,14 @@ func NewSplitChangesCollection(db DBWrapper, logger logging.LoggerInterface) *Sp
 
 // Update processes a set of feature flag changes items + a changeNumber bump atomically
 func (c *SplitChangesCollection) Update(toAdd []dtos.SplitDTO, toRemove []dtos.SplitDTO, cn int64) {
-
-	items := make(SplitsChangesItems, 0, len(toAdd)+len(toRemove))
+	items := NewChangesItems(len(toAdd) + len(toRemove))
 	process := func(split *dtos.SplitDTO) {
 		asJSON, err := json.Marshal(split)
 		if err != nil {
 			// This should not happen unless the DTO class is broken
 			return
 		}
-		items = append(items, SplitChangesItem{
+		items.Append(ChangesItem{
 			ChangeNumber: split.ChangeNumber,
 			Name:         split.Name,
 			Status:       split.Status,
@@ -80,8 +54,8 @@ func (c *SplitChangesCollection) Update(toAdd []dtos.SplitDTO, toRemove []dtos.S
 
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
-	for idx := range items {
-		err := c.collection.SaveAs([]byte(items[idx].Name), items[idx])
+	for idx := range items.items {
+		err := c.collection.SaveAs([]byte(items.items[idx].Name), items.items[idx])
 		if err != nil {
 			// TODO(mredolatti): log
 		}
@@ -102,7 +76,7 @@ func (c *SplitChangesCollection) FetchAll() ([]dtos.SplitDTO, error) {
 
 	var decodeBuffer bytes.Buffer
 	for _, v := range items {
-		var q SplitChangesItem
+		var q ChangesItem
 		// resets buffer data
 		decodeBuffer.Reset()
 		decodeBuffer.Write(v)