Add field mapping in sort too

Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>

Author: peterbroadhurst

pkg/ffapi/restfilter_json.go

@@ -178,8 +178,19 @@ func (jq *QueryJSON) BuildFilter(ctx context.Context, qf QueryFactory, options .
 	if jq.Limit != nil {
 		fb = fb.Limit(*jq.Limit)
 	}
-	for _, s := range jq.Sort {
-		fb = fb.Sort(s)
+	if len(jq.Sort) > 0 {
+		rv := buildResolveCtx(ctx, &jq.FilterJSON, options...)
+		for _, field := range jq.Sort {
+			field, isDesc := strings.CutPrefix(field, "-")
+			field, err := validateFilterField(ctx, fb, field, rv)
+			if err != nil {
+				return nil, err
+			}
+			if isDesc {
+				field = "-" + field
+			}
+			fb = fb.Sort(field)
+		}
 	}
 	return (&jq.FilterJSON).BuildSubFilter(ctx, fb, options...)
 }

pkg/ffapi/restfilter_json_test.go

@@ -24,6 +24,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestBuildQueryJSONNestedAndOr(t *testing.T) {
@@ -167,6 +168,7 @@ func TestBuildQuerySingleNestedWithResolverOk(t *testing.T) {
 
 	var qf QueryJSON
 	err := json.Unmarshal([]byte(`{
+	    "sort": ["-created"],
 		"or": [
 			{
 				"equal": [
@@ -199,7 +201,7 @@ func TestBuildQuerySingleNestedWithResolverOk(t *testing.T) {
 	fi, err := filter.Finalize()
 	assert.NoError(t, err)
 
-	assert.Equal(t, "tag.resolved == 'b'", fi.String())
+	assert.Equal(t, "tag.resolved == 'b' sort=-created.resolved", fi.String())
 }
 
 func TestBuildQuerySingleNestedWithResolverError(t *testing.T) {
@@ -228,6 +230,21 @@ func TestBuildQuerySingleNestedWithResolverError(t *testing.T) {
 	assert.Regexp(t, "pop", err)
 }
 
+func TestBuildQuerySingleNestedWithFieldResolverError(t *testing.T) {
+
+	var qf QueryJSON
+	err := json.Unmarshal([]byte(`{
+		"sort": ["wrong"]
+	}`), &qf)
+	assert.NoError(t, err)
+
+	_, err = qf.BuildFilter(context.Background(), TestQueryFactory, FieldResolver(func(ctx context.Context, fieldName string) (resolvedFieldName string, err error) {
+		require.Equal(t, "wrong", fieldName)
+		return "", fmt.Errorf("pop")
+	}))
+	assert.Regexp(t, "pop", err)
+}
+
 func TestBuildQueryJSONEqual(t *testing.T) {
 
 	var qf QueryJSON