fix: dataset link merge bug #378 (#18)

* - return the overridden value * - add test case * - fix bug
reearth · Jul 7, 2021 · 25da0d1 · 25da0d1
1 parent aebac3f
commit 25da0d1
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 4 deletions.
diff --git a/internal/graphql/resolver_property.go b/internal/graphql/resolver_property.go
@@ -142,7 +142,7 @@ func (r *propertyFieldResolver) ActualValue(ctx context.Context, obj *graphql1.P
 	defer exit()
 
 	datasetLoader := dataloader.DataLoadersFromContext(ctx).Dataset
-	return actualValue(datasetLoader, obj.Value, obj.Links)
+	return actualValue(datasetLoader, obj.Value, obj.Links, false)
 }
 
 func (r *propertySchemaFieldResolver) TranslatedTitle(ctx context.Context, obj *graphql1.PropertySchemaField, lang *string) (string, error) {
@@ -422,7 +422,7 @@ func (r *mergedPropertyFieldResolver) ActualValue(ctx context.Context, obj *grap
 	defer exit()
 
 	datasetLoader := dataloader.DataLoadersFromContext(ctx).Dataset
-	return actualValue(datasetLoader, obj.Value, obj.Links)
+	return actualValue(datasetLoader, obj.Value, obj.Links, obj.Overridden)
 }
 
 type propertyGroupListResolver struct{ *Resolver }
@@ -465,8 +465,8 @@ func (*propertyGroupResolver) SchemaGroup(ctx context.Context, obj *graphql1.Pro
 	return s.Group(obj.SchemaGroupID), nil
 }
 
-func actualValue(datasetLoader dataloader.DatasetDataLoader, value interface{}, links []*graphql1.PropertyFieldLink) (interface{}, error) {
-	if len(links) == 0 {
+func actualValue(datasetLoader dataloader.DatasetDataLoader, value interface{}, links []*graphql1.PropertyFieldLink, overridden bool) (interface{}, error) {
+	if len(links) == 0 || overridden {
 		return &value, nil
 	}
 	// 先頭のリンクにしかDatasetが割り当てられていない→先頭から順々に辿っていく

diff --git a/internal/graphql/resolver_property_test.go b/internal/graphql/resolver_property_test.go
@@ -0,0 +1,50 @@
+package graphql
+
+import (
+	"testing"
+
+	graphql1 "github.com/reearth/reearth-backend/internal/adapter/graphql"
+	"github.com/reearth/reearth-backend/internal/graphql/dataloader"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_actualValue(t *testing.T) {
+	value := 300
+
+	type args struct {
+		datasetLoader dataloader.DatasetDataLoader
+		value         interface{}
+		links         []*graphql1.PropertyFieldLink
+		overridden    bool
+	}
+	var tests = []struct {
+		name    string
+		args    args
+		want    interface{}
+		wantErr bool
+	}{
+		{
+			"Overridden value",
+			args{
+				datasetLoader: nil,
+				value:         value,
+				links:         nil,
+				overridden:    true,
+			},
+			300,
+			false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := actualValue(tt.args.datasetLoader, tt.args.value, tt.args.links, tt.args.overridden)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("actualValue() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			temp := got.(*interface{})
+			t2 := (*temp).(int)
+			assert.Equal(t, tt.want, t2)
+		})
+	}
+}