Checkpoint

Author: steve-r-west

external/autofill/autofill.go

@@ -1,105 +1,47 @@
 package autofill
 
 import (
-	"fmt"
-	"reflect"
-	"strconv"
 	"strings"
 
-	"github.com/brianvoe/gofakeit/v6"
+	"github.com/elasticpath/epcc-cli/external/faker"
 	"github.com/elasticpath/epcc-cli/external/resources"
-	log "github.com/sirupsen/logrus"
 )
 
-var faker = gofakeit.New(0)
-
-var zeroValue = reflect.Value{}
-
 func GetAutoFillQueryParameters(resourceName string, qps []resources.QueryParameter) []string {
 	args := make([]string, 0)
 
 	for _, v := range qps {
 		key := v.Name
 		autoFill := v.AutoFill
-		args = processAutoFill(resourceName, autoFill, args, key, key)
+		args = processAutoFill(autoFill, args, key)
 	}
 
 	return args
 }
+
 func GetJsonArrayForResource(r *resources.Resource) []string {
 
 	args := make([]string, 0)
 
-	for attributeName, data := range r.Attributes {
+	for _, data := range r.Attributes {
 		key := data.Key
 		key = strings.Replace(key, "data[n]", "data[0]", 1)
 		autofill := data.AutoFill
 
-		args = processAutoFill(r.SingularName, autofill, args, key, attributeName)
+		args = processAutoFill(autofill, args, key)
 
 	}
 	return args
 
 }
 
-func processAutoFill(resourceName string, autofill string, args []string, key string, attributeName string) []string {
+func processAutoFill(autofill string, args []string, key string) []string {
 	if strings.HasPrefix(autofill, "FUNC:") {
 
-		v := reflect.ValueOf(faker)
 		methodName := strings.Trim(autofill[5:], " ")
 
-		var rejectZero = false
-		if strings.HasPrefix(methodName, "NonZero") {
-			methodName = methodName[7:]
-			rejectZero = true
-		}
-
-		method := v.MethodByName(methodName)
-		if method.IsValid() {
-			result := method.Call([]reflect.Value{})
-			if len(result) == 1 {
-
-				var arg string
-
-				switch {
-				case result[0].CanUint():
-					for true {
-						v := result[0].Uint()
-						if v == 0 && rejectZero {
-							result = method.Call([]reflect.Value{})
-							continue
-						}
-						arg = strconv.FormatUint(v, 10)
-						break
-					}
-
-				case result[0].CanInt():
-					for true {
-						v := result[0].Int()
-						if v == 0 && rejectZero {
-							result = method.Call([]reflect.Value{})
-							continue
-						}
-						arg = strconv.FormatInt(v, 10)
-						break
-					}
-				default:
-					arg = result[0].String()
-
-					if _, err := strconv.Atoi(arg); err == nil {
-						// If we get an integer value back, lets just quote it.
-						arg = fmt.Sprintf("\"%s\"", arg)
-					}
-				}
-
-				args = append(args, key, arg)
-			} else {
-				log.Warnf("Got unexpected number of results from calling %s -> %d", methodName, len(result))
-			}
-
-		} else {
-			log.Warnf("Could not find autofill method %s for attribute %s on resource %s", methodName, attributeName, resourceName)
-		}
+		v := faker.CallFakeFunc(methodName)
+		args = append(args, key, v)
 
 	} else if strings.HasPrefix(autofill, "VALUE:") {
 		args = append(args, key, strings.Trim(autofill[6:], " "))

external/faker/faker.go

@@ -0,0 +1,75 @@
+package faker
+
+import (
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+
+	"github.com/brianvoe/gofakeit/v6"
+	log "github.com/sirupsen/logrus"
+)
+
+var faker = gofakeit.New(1)
+
+func Seed(n int64) {
+	faker = gofakeit.New(n)
+}
+
+func CallFakeFunc(methodName string) string {
+
+	var arg string
+	v := reflect.ValueOf(faker)
+
+	var rejectZero = false
+	if strings.HasPrefix(methodName, "NonZero") {
+		methodName = methodName[7:]
+		rejectZero = true
+	}
+
+	method := v.MethodByName(methodName)
+	if method.IsValid() {
+		result := method.Call([]reflect.Value{})
+		if len(result) == 1 {
+
+			switch {
+			case result[0].CanUint():
+				for {
+					v := result[0].Uint()
+					if v == 0 && rejectZero {
+						result = method.Call([]reflect.Value{})
+						continue
+					}
+					arg = strconv.FormatUint(v, 10)
+					break
+				}
+
+			case result[0].CanInt():
+				for {
+					v := result[0].Int()
+					if v == 0 && rejectZero {
+						result = method.Call([]reflect.Value{})
+						continue
+					}
+					arg = strconv.FormatInt(v, 10)
+					break
+				}
+			default:
+				arg = result[0].String()
+
+				if _, err := strconv.Atoi(arg); err == nil {
+					// If we get an integer value back, lets just quote it.
+					arg = fmt.Sprintf("\"%s\"", arg)
+				}
+			}
+
+		} else {
+			log.Warnf("Got unexpected number of results from calling %s -> %d", methodName, len(result))
+		}
+
+	} else {
+		log.Warnf("Could not find autofill method %s", methodName)
+	}
+
+	return arg
+}

external/json/to_json.go

@@ -4,6 +4,7 @@ import (
 	gojson "encoding/json"
 	"fmt"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/elasticpath/epcc-cli/external/aliases"
@@ -21,7 +22,26 @@ var attributeWithArrayIndex = regexp.MustCompile("\\[[0-9]+]")
 func ToJson(args []string, noWrapping bool, compliant bool, attributes map[string]*resources.CrudEntityAttribute, useAliases bool, autoAddConstantValues bool) (string, error) {
 
 	if len(args)%2 == 1 {
-		return "", fmt.Errorf("the number of arguments %d supplied isn't even, json should be passed in key value pairs. Do you have an extra/missing id?", len(args))
+		if log.IsLevelEnabled(log.DebugLevel) {
+			fmt.Printf("\n\n\nArgument Dump:\n")
+			maxlen := 0
+
+			for _, v := range args {
+				if len(v) > maxlen {
+					maxlen = len(v)
+				}
+			}
+
+			for i := 0; i < len(args); i++ {
+				fmt.Printf("%"+strconv.Itoa(maxlen)+"s ", args[i])
+
+				if i%2 == 1 {
+					fmt.Println()
+				}
+			}
+			fmt.Printf("\n\n\n\n")
+		}
+		return "", fmt.Errorf("the number of arguments %d supplied isn't even, json should be passed in key value pairs. Do you have an extra/missing id? Tip: Enable log level debug to see a dump", len(args))
 	}
 
 	firstArrayKeyIdx := -1

external/json/to_json_test.go

@@ -742,3 +742,18 @@ func TestToJsonDoesNotAddsAdjacentConstantValuesWithoutAnAdjacentObject(t *testi
 		t.Fatalf("Testing json conversion of empty value %s did not match\nExpected: %s\nActually: %s", input, expected, actual)
 	}
 }
+
+// This is primarily a "hack" for manual-orders, could be improved later.
+func TestToJsonLegacyFormatIncludedKeyNotPromoted(t *testing.T) {
+	// Fixture Setup
+	input := []string{"key", "val", "included", "val"}
+	expected := `{"data":{"key":"val"},"included":"val"}`
+
+	// Execute SUT
+	actual, _ := ToJson(input, false, false, map[string]*resources.CrudEntityAttribute{}, true, true)
+
+	// Verification
+	if actual != expected {
+		t.Fatalf("Testing json conversion of empty value %s did not match expected %s, actually: %s", input, expected, actual)
+	}
+}