fix(server): prefer dataset values when merging properties (#388)

reearth · Mar 8, 2023 · 8112f74 · 8112f74
1 parent b17807a
commit 8112f74
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/pkg/property/sealed_test.go b/server/pkg/property/sealed_test.go
@@ -447,13 +447,13 @@ func TestSealed_Interface(t *testing.T) {
 				"x": []map[string]interface{}{
 					{
 						"a":  "a",
-						"b":  "bbb",
+						"b":  "b",
 						"id": i5id.String(),
 					},
 				},
 				"y": map[string]interface{}{
 					"a": "aaa",
-					"b": "bbb",
+					"b": "aaa",
 				},
 			},
 		},

diff --git a/server/pkg/property/value_dataset.go b/server/pkg/property/value_dataset.go
@@ -56,7 +56,7 @@ func (v *ValueAndDatasetValue) Value() *Value {
 	if v == nil || v.t == ValueTypeUnknown {
 		return nil
 	}
-	if v.d != nil {
+	if v.d != nil && v.p == nil {
 		return valueFromDataset(v.d)
 	}
 	return v.p

diff --git a/server/pkg/property/value_dataset_test.go b/server/pkg/property/value_dataset_test.go
@@ -295,7 +295,7 @@ func TestValueAndDatasetValue_Value(t *testing.T) {
 				d: dataset.ValueTypeString.MustBeValue("foo"),
 				p: ValueTypeString.MustBeValue("bar"),
 			},
-			want: ValueTypeString.MustBeValue("foo"),
+			want: ValueTypeString.MustBeValue("bar"),
 		},
 		{
 			name:   "empty",