fix: updated to include checks for additional dataset fields

datasetDiffer.go

@@ -22,6 +22,10 @@ func (diffList DiffList) String() string {
 	return ""
 }
 
+func (diffList DiffList) List() []Diff {
+	return diffList.diffs
+}
+
 func diffStructure(a, b *dataset.Dataset) (*DiffList, error) {
 	diffList := &DiffList{}
 	diffDescription := Diff("")
@@ -43,6 +47,41 @@ func diffStructure(a, b *dataset.Dataset) (*DiffList, error) {
 	return diffList, nil
 }
 
+func diffTransform(a, b *dataset.Dataset) (*DiffList, error) {
+	diffList := &DiffList{}
+	diffDescription := Diff("")
+	if a.Transform != nil && b.Transform != nil {
+		if len(a.Transform.Path().String()) > 1 && len(b.Transform.Path().String()) > 1 {
+			if a.Transform.Path() != b.Transform.Path() {
+				diffDescription = Diff("Transform Changed.")
+				diffList.diffs = append(diffList.diffs, diffDescription)
+			}
+		}
+		// else {
+		// 	...
+		// }
+	}
+
+	return diffList, nil
+}
+
+func diffVisConfig(a, b *dataset.Dataset) (*DiffList, error) {
+	diffList := &DiffList{}
+	diffDescription := Diff("")
+	if a.VisConfig != nil && b.VisConfig != nil {
+		if len(a.VisConfig.Path().String()) > 1 && len(b.VisConfig.Path().String()) > 1 {
+			if a.VisConfig.Path() != b.VisConfig.Path() {
+				diffDescription = Diff("VisConfig Changed.")
+				diffList.diffs = append(diffList.diffs, diffDescription)
+			}
+		}
+		// else {
+		// ...
+		// }x
+	}
+	return diffList, nil
+}
+
 //TODO: make work
 func diffData(a, b *dataset.Dataset) (*DiffList, error) {
 	temporarilyBlindToData := true // <-- REMOVE this
@@ -116,5 +155,21 @@ func DiffDatasets(a, b *dataset.Dataset) (*DiffList, error) {
 	if len(metaDiffList.diffs) > 0 {
 		diffList.diffs = append(diffList.diffs, metaDiffList.diffs...)
 	}
+	// Compare Transform
+	transformDiffList, err := diffTransform(a, b)
+	if err != nil {
+		return nil, err
+	}
+	if len(transformDiffList.diffs) > 0 {
+		diffList.diffs = append(diffList.diffs, transformDiffList.diffs...)
+	}
+	// Compare VisConfig
+	visConfigDiffList, err := diffVisConfig(a, b)
+	if err != nil {
+		return nil, err
+	}
+	if len(visConfigDiffList.diffs) > 0 {
+		diffList.diffs = append(diffList.diffs, visConfigDiffList.diffs...)
+	}
 	return diffList, nil
 }

datasetDiffer_test.go

@@ -33,15 +33,19 @@ func TestDiffDataset(t *testing.T) {
 		expected string
 		err      string
 	}{
-		{"testdata/exampleData_orig.json", "testdata/exampleData_orig.json", "", ""},
-		{"testdata/exampleData_orig.json", "testdata/exampleData_newData.json", "Data Changed.", ""},
-		{"testdata/exampleData_orig.json", "testdata/exampleData_newStructure.json", "Structure Changed.", ""},
-		{"testdata/exampleData_oldChecksum.json", "testdata/exampleData_newChecksum.json", "Structure Changed.", ""},
-		{"testdata/exampleData_orig.json", "testdata/exampleData_newDataAndStructure.json", "Structure Changed.", ""},
-		{"testdata/exampleData_orig.json", "testdata/exampleData_blankStructure.json", "", "error: structure path cannot be empty string"},
-		{"testdata/exampleData_orig.json", "testdata/exampleData_blankData.json", "", "error: data path cannot be empty string"},
-		{"testdata/exampleData_orig_with_meta.json", "testdata/exampleData_newTitle.json", "Title Changed.", ""},
-		{"testdata/exampleData_orig_with_meta.json", "testdata/exampleData_newDescription.json", "Description Changed.", ""},
+		{"testdata/orig.json", "testdata/orig.json", "", ""},
+		{"testdata/orig.json", "testdata/newData.json", "Data Changed.", ""},
+		{"testdata/orig.json", "testdata/newStructure.json", "Structure Changed.", ""},
+		{"testdata/oldChecksum.json", "testdata/newChecksum.json", "Structure Changed.", ""},
+		{"testdata/orig.json", "testdata/newDataAndStructure.json", "Structure Changed.", ""},
+		{"testdata/orig.json", "testdata/blankStructure.json", "", "error: structure path cannot be empty string"},
+		{"testdata/orig.json", "testdata/blankData.json", "", "error: data path cannot be empty string"},
+		{"testdata/orig_with_meta.json", "testdata/newTitle.json", "Title Changed.", ""},
+		{"testdata/orig_with_meta.json", "testdata/newDescription.json", "Description Changed.", ""},
+		//TODO: test transform change (need path)
+		// {"orig_with_vis_config_and_transform.json", "orig_with_vis_config_and_transform.json", "Transform Changed.", ""}
+		//TODO: test visconfig change (need path)
+		// {"orig_with_vis_config_and_transform.json", "orig_with_vis_config_and_transform.json", "VisConfig Changed.", ""}
 	}
 	// load files and execute tests
 	for i, c := range cases {

testdata/orig_with_vis_config_and_transform.json

@@ -0,0 +1,12 @@
+{
+  "kind": "qri:ds:0",
+  "DataPath": "abc",
+  "path": "123",
+  "structure": "abc",
+  "meta": {
+  	"title": "abc",
+  	"description": "I am a dataset"
+  }, 
+  "visConfig": "hash1",
+  "transform": "hash2"
+}