chore: consolidate SortedSetPutElement to SortedSetElement, add util (#…

…279)

* chore: consolidate SortedSetPutElement to SortedSetElement, add util

This commit renames SortedSetPutElement to SortedSetElement, for
consistency with the Dictionary API.  Also introduces a helper function
for creating an array of SortedSetPutElements from a map, like we
support for Dictionaries.

momento/cache_client.go

@@ -36,7 +36,7 @@ type CacheClient interface {
 
 	// SortedSetFetch fetches the elements in the given sorted set by index rank or by score.
 	SortedSetFetch(ctx context.Context, r *SortedSetFetchRequest) (responses.SortedSetFetchResponse, error)
-	// SortedSetPutElement adds an element to the given sorted set. If the element already exists,
+	// SortedSetElement adds an element to the given sorted set. If the element already exists,
 	// its score is updated. Creates the sorted set if it does not exist.
 	SortedSetPutElement(ctx context.Context, r *SortedSetPutElementRequest) (responses.SortedSetPutElementResponse, error)
 	// SortedSetPutElements adds elements to the given sorted set. If an element already exists,
@@ -289,7 +289,7 @@ func (c defaultScsClient) SortedSetPutElement(ctx context.Context, r *SortedSetP
 	newRequest := &SortedSetPutElementsRequest{
 		CacheName: r.CacheName,
 		SetName:   r.SetName,
-		Elements:  []SortedSetPutElement{{Value: r.Value, Score: r.Score}},
+		Elements:  []SortedSetElement{{Value: r.Value, Score: r.Score}},
 		Ttl:       r.Ttl,
 	}
 	if err := c.dataClient.makeRequest(ctx, newRequest); err != nil {

momento/momento_suite_test.go

@@ -55,12 +55,12 @@ func HaveListLength(length int) types.GomegaMatcher {
 	)
 }
 
-func HaveSortedSetElements(expected []responses.SortedSetElement) types.GomegaMatcher {
+func HaveSortedSetElements(expected []responses.SortedSetBytesElement) types.GomegaMatcher {
 	return WithTransform(
-		func(fetchResp responses.SortedSetFetchResponse) ([]responses.SortedSetElement, error) {
+		func(fetchResp responses.SortedSetFetchResponse) ([]responses.SortedSetBytesElement, error) {
 			switch rtype := fetchResp.(type) {
 			case *responses.SortedSetFetchHit:
-				return rtype.ValueByteElements(), nil
+				return rtype.ValueBytesElements(), nil
 			default:
 				return nil, fmt.Errorf("expected SortedSetFetchHit, but got %T", fetchResp)
 			}

momento/requester.go

@@ -239,52 +239,3 @@ func validateNotNil(value Value, label string) error {
 
 	return nil
 }
-
-// DictionaryElementsFromMap converts a map[string]string to an array of momento DictionaryElements.
-//
-//	DictionaryElements are used as input to DictionarySetFields.
-func DictionaryElementsFromMap(theMap map[string]string) []DictionaryElement {
-	return DictionaryElementsFromMapStringString(theMap)
-}
-
-// DictionaryElementsFromMapStringString converts a map[string]string to an array of momento DictionaryElements.
-//
-//	DictionaryElements are used as input to DictionarySetFields.
-func DictionaryElementsFromMapStringString(theMap map[string]string) []DictionaryElement {
-	var elements []DictionaryElement
-	for k, v := range theMap {
-		elements = append(elements, DictionaryElement{
-			Field: String(k),
-			Value: String(v),
-		})
-	}
-	return elements
-}
-
-// DictionaryElementsFromMapStringBytes converts a map[string][]byte to an array of momento DictionaryElements.
-//
-//	DictionaryElements are used as input to DictionarySetFields.
-func DictionaryElementsFromMapStringBytes(theMap map[string][]byte) []DictionaryElement {
-	var elements []DictionaryElement
-	for k, v := range theMap {
-		elements = append(elements, DictionaryElement{
-			Field: String(k),
-			Value: Bytes(v),
-		})
-	}
-	return elements
-}
-
-// DictionaryElementsFromMapStringValue converts a map[string]momento.Value to an array of momento DictionaryElements.
-//
-//	DictionaryElements are used as input to DictionarySetFields.
-func DictionaryElementsFromMapStringValue(theMap map[string]Value) []DictionaryElement {
-	var elements []DictionaryElement
-	for k, v := range theMap {
-		elements = append(elements, DictionaryElement{
-			Field: String(k),
-			Value: v,
-		})
-	}
-	return elements
-}

momento/sorted_set_fetch.go

@@ -155,10 +155,10 @@ func (r *SortedSetFetchRequest) interpretGrpcResponse() error {
 	return nil
 }
 
-func sortedSetGrpcElementToModel(grpcSetElements []*pb.XSortedSetElement) []responses.SortedSetElement {
-	var returnList []responses.SortedSetElement
+func sortedSetGrpcElementToModel(grpcSetElements []*pb.XSortedSetElement) []responses.SortedSetBytesElement {
+	var returnList []responses.SortedSetBytesElement
 	for _, element := range grpcSetElements {
-		returnList = append(returnList, responses.SortedSetElement{
+		returnList = append(returnList, responses.SortedSetBytesElement{
 			Value: element.Value,
 			Score: element.Score,
 		})

momento/sorted_set_put_elements.go

@@ -10,15 +10,10 @@ import (
 	"github.com/momentohq/client-sdk-go/utils"
 )
 
-type SortedSetPutElement struct {
-	Value Value
-	Score float64
-}
-
 type SortedSetPutElementsRequest struct {
 	CacheName string
 	SetName   string
-	Elements  []SortedSetPutElement
+	Elements  []SortedSetElement
 	Ttl       *utils.CollectionTtl
 
 	grpcRequest  *pb.XSortedSetPutRequest
@@ -72,7 +67,7 @@ func (r *SortedSetPutElementsRequest) interpretGrpcResponse() error {
 	return nil
 }
 
-func convertSortedSetElementsToGrpc(modelSetElements []SortedSetPutElement) []*pb.XSortedSetElement {
+func convertSortedSetElementsToGrpc(modelSetElements []SortedSetElement) []*pb.XSortedSetElement {
 	var returnList []*pb.XSortedSetElement
 	for _, el := range modelSetElements {
 		returnList = append(returnList, &pb.XSortedSetElement{