tests(restQL): update testes to handle the new ResponseBody type

americanas-tech · Sep 28, 2020 · d54d9ec · d54d9ec
1 parent 683ba0d
commit d54d9ec
Show file tree

Hide file tree

Showing 11 changed files with 441 additions and 218 deletions.
diff --git a/internal/eval/aggregators_test.go b/internal/eval/aggregators_test.go
@@ -35,12 +35,21 @@ func TestApplyAggregators(t *testing.T) {
 				{Resource: "sidekick", In: []string{"hero", "sidekick"}},
 			}},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman" }`)},
-				"sidekick": restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 10, "name": "robin" }`)},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 1, "name": "batman" }`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 10, "name": "robin" }`),
+				)},
 			},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }`)},
-				"sidekick": restql.DoneResource{ResponseBody: nil},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
 			},
 		},
 		{
@@ -50,12 +59,21 @@ func TestApplyAggregators(t *testing.T) {
 				{Resource: "sidekick", In: []string{"hero", "info", "partners", "sidekick"}},
 			}},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman" }`)},
-				"sidekick": restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 10, "name": "robin" }`)},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 1, "name": "batman" }`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 10, "name": "robin" }`),
+				)},
 			},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman", "info": { "partners": { "sidekick": { "id": 10, "name": "robin" } } } }`)},
-				"sidekick": restql.DoneResource{ResponseBody: nil},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 1, "name": "batman", "info": { "partners": { "sidekick": { "id": 10, "name": "robin" } } } }`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
 			},
 		},
 		{
@@ -65,12 +83,21 @@ func TestApplyAggregators(t *testing.T) {
 				{Resource: "sidekick", In: []string{"hero", "sidekick"}},
 			}},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman" }`)},
-				"sidekick": restql.DoneResource{ResponseBody: test.Unmarshal(`[{ "id": 10, "name": "robin" }, { "id": 11, "name": "batgirl" }]`)},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 1, "name": "batman" }`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`[{ "id": 10, "name": "robin" }, { "id": 11, "name": "batgirl" }]`),
+				)},
 			},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick":  [{ "id": 10, "name": "robin" }, { "id": 11, "name": "batgirl" }]}`)},
-				"sidekick": restql.DoneResource{ResponseBody: nil},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick":  [{ "id": 10, "name": "robin" }, { "id": 11, "name": "batgirl" }]}`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
 			},
 		},
 		{
@@ -81,17 +108,32 @@ func TestApplyAggregators(t *testing.T) {
 			}},
 			domain.Resources{
 				"hero": restql.DoneResources{
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman" }`)},
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 2, "name": "wonder woman" }`)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 1, "name": "batman" }`),
+					)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 2, "name": "wonder woman" }`),
+					)},
 				},
-				"sidekick": restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 10, "name": "robin" }`)},
+				"sidekick": restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 10, "name": "robin" }`),
+				)},
 			},
 			domain.Resources{
 				"hero": restql.DoneResources{
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }`)},
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 2, "name": "wonder woman", "sidekick": { "id": 10, "name": "robin" } }`)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }`),
+					)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 2, "name": "wonder woman", "sidekick": { "id": 10, "name": "robin" } }`),
+					)},
 				},
-				"sidekick": restql.DoneResource{ResponseBody: nil},
+				"sidekick": restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
 			},
 		},
 		{
@@ -101,12 +143,21 @@ func TestApplyAggregators(t *testing.T) {
 				{Resource: "sidekick", In: []string{"hero", "sidekick"}},
 			}},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`[{ "id": 1, "name": "batman" }, { "id": 2, "name": "wonder woman" }]`)},
-				"sidekick": restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 10, "name": "robin" }`)},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`[{ "id": 1, "name": "batman" }, { "id": 2, "name": "wonder woman" }]`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 10, "name": "robin" }`),
+				)},
 			},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`[{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }, { "id": 2, "name": "wonder woman", "sidekick": { "id": 10, "name": "robin" } }]`)},
-				"sidekick": restql.DoneResource{ResponseBody: nil},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`[{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }, { "id": 2, "name": "wonder woman", "sidekick": { "id": 10, "name": "robin" } }]`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
 			},
 		},
 		{
@@ -116,20 +167,31 @@ func TestApplyAggregators(t *testing.T) {
 				{Resource: "sidekick", In: []string{"hero", "sidekick"}},
 			}},
 			domain.Resources{
-				"hero": restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman" }`)},
+				"hero": restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`{ "id": 1, "name": "batman" }`),
+				)},
 				"sidekick": restql.DoneResources{
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 10, "name": "robin" }`)},
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 11, "name": "batgirl" }`)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 10, "name": "robin" }`),
+					)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 11, "name": "batgirl" }`),
+					)},
 				},
 			},
 			domain.Resources{
 				"hero": restql.DoneResource{
-
-					ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick": [{ "id": 10, "name": "robin" }, { "id": 11, "name": "batgirl" }] }`),
+					ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick": [{ "id": 10, "name": "robin" }, { "id": 11, "name": "batgirl" }] }`),
+					),
 				},
 				"sidekick": restql.DoneResources{
-					restql.DoneResource{ResponseBody: nil},
-					restql.DoneResource{ResponseBody: nil},
+					restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
+					restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
 				},
 			},
 		},
@@ -141,28 +203,44 @@ func TestApplyAggregators(t *testing.T) {
 			}},
 			domain.Resources{
 				"hero": restql.DoneResources{
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman"}`)},
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 2, "name": "wonder woman"}`)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 1, "name": "batman"}`),
+					)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 2, "name": "wonder woman"}`),
+					)},
 				},
 				"sidekick": restql.DoneResources{
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 10, "name": "robin" }`)},
-					restql.DoneResource{ResponseBody: test.Unmarshal(`{ "id": 11, "name": "batgirl" }`)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 10, "name": "robin" }`),
+					)},
+					restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+						test.NoOpLogger,
+						test.Unmarshal(`{ "id": 11, "name": "batgirl" }`),
+					)},
 				},
 			},
 			domain.Resources{
 				"hero": restql.DoneResources{
 					restql.DoneResource{
-
-						ResponseBody: test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }`),
+						ResponseBody: restql.NewResponseBodyFromValue(
+							test.NoOpLogger,
+							test.Unmarshal(`{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }`),
+						),
 					},
 					restql.DoneResource{
-
-						ResponseBody: test.Unmarshal(`{ "id": 2, "name": "wonder woman", "sidekick": { "id": 11, "name": "batgirl" } }`),
+						ResponseBody: restql.NewResponseBodyFromValue(
+							test.NoOpLogger,
+							test.Unmarshal(`{ "id": 2, "name": "wonder woman", "sidekick": { "id": 11, "name": "batgirl" } }`),
+						),
 					},
 				},
 				"sidekick": restql.DoneResources{
-					restql.DoneResource{ResponseBody: nil},
-					restql.DoneResource{ResponseBody: nil},
+					restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
+					restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
 				},
 			},
 		},
@@ -173,12 +251,21 @@ func TestApplyAggregators(t *testing.T) {
 				{Resource: "sidekick", In: []string{"hero", "sidekick"}},
 			}},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`[{ "id": 1, "name": "batman" }, { "id": 2, "name": "wonder woman" }]`)},
-				"sidekick": restql.DoneResource{ResponseBody: test.Unmarshal(`[{ "id": 10, "name": "robin" }, { "id": 11, "name": "batgirl" }]`)},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`[{ "id": 1, "name": "batman" }, { "id": 2, "name": "wonder woman" }]`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`[{ "id": 10, "name": "robin" }, { "id": 11, "name": "batgirl" }]`),
+				)},
 			},
 			domain.Resources{
-				"hero":     restql.DoneResource{ResponseBody: test.Unmarshal(`[{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }, { "id": 2, "name": "wonder woman", "sidekick": { "id": 11, "name": "batgirl" } }]`)},
-				"sidekick": restql.DoneResource{ResponseBody: nil},
+				"hero":     restql.DoneResource{ResponseBody: restql.NewResponseBodyFromValue(
+					test.NoOpLogger,
+					test.Unmarshal(`[{ "id": 1, "name": "batman", "sidekick": { "id": 10, "name": "robin" } }, { "id": 2, "name": "wonder woman", "sidekick": { "id": 11, "name": "batgirl" } }]`),
+				)},
+				"sidekick": restql.DoneResource{ResponseBody: &restql.ResponseBody{}},
 			},
 		},
 	}

diff --git a/internal/eval/filters.go b/internal/eval/filters.go
@@ -11,11 +11,11 @@ import (
 
 // ApplyFilters returns a version of the already resolved Resources
 // only with the fields defined by the `only` clause.
-func ApplyFilters(log restql.Logger, query domain.Query, resources restql.Resources) (restql.Resources, error) {
-	result := make(restql.Resources)
+func ApplyFilters(log restql.Logger, query domain.Query, resources domain.Resources) (domain.Resources, error) {
+	result := make(domain.Resources)
 
 	for _, stmt := range query.Statements {
-		resourceID := restql.NewResourceID(stmt)
+		resourceID := domain.NewResourceID(stmt)
 		dr := resources[resourceID]
 
 		filtered, err := applyOnlyFilters(stmt.Only, dr)
@@ -37,7 +37,8 @@ func applyOnlyFilters(filters []interface{}, resourceResult interface{}) (interf
 
 	switch resourceResult := resourceResult.(type) {
 	case restql.DoneResource:
-		result, err := extractWithFilters(buildFilterTree(filters), resourceResult.ResponseBody)
+		body := resourceResult.ResponseBody.Unmarshal()
+		result, err := extractWithFilters(buildFilterTree(filters), body)
 		if err != nil {
 			return nil, err
 		}
@@ -263,14 +264,14 @@ func parsePath(s interface{}) []interface{} {
 
 // ApplyHidden returns a version of the already resolved Resources
 // removing the statement results with the `hidden` clause.
-func ApplyHidden(query domain.Query, resources restql.Resources) restql.Resources {
-	result := make(restql.Resources)
+func ApplyHidden(query domain.Query, resources domain.Resources) domain.Resources {
+	result := make(domain.Resources)
 
 	for _, stmt := range query.Statements {
 		if stmt.Hidden {
 			continue
 		}
-		resourceID := restql.NewResourceID(stmt)
+		resourceID := domain.NewResourceID(stmt)
 		dr := resources[resourceID]
 
 		result[resourceID] = dr