fix(core.History): fix null datasets in repsonses

qri-io · Nov 28, 2017 · ab1fd7c · ab1fd7c
1 parent a8fd2ec
commit ab1fd7c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/core/queries.go b/core/queries.go
@@ -33,7 +33,17 @@ func (d *QueryRequests) List(p *ListParams, res *[]*repo.DatasetRef) error {
  ref.Dataset = ds
  }
  }
- *res = results
+
+ // TODO - clean this up, this is a hack to prevent null datasets from
+ // being sent back as responses.
+ // Warning - this could throw off pagination :/
+ final := []*repo.DatasetRef{}
+ for _, ref := range results {
+ if ref.Dataset != nil {
+ final = append(final, ref)
+ }
+ }
+ *res = final
  return nil
 }
 

diff --git a/core/queries_test.go b/core/queries_test.go
@@ -135,15 +135,15 @@ func TestDatasetQueries(t *testing.T) {
  return
  }
 
- ns, err := mr.Namespace(30, 0)
- if err != nil {
- t.Errorf("error getting repo namespace: %s", err.Error())
- return
- }
+ // ns, err := mr.Namespace(30, 0)
+ // if err != nil {
+ //  t.Errorf("error getting repo namespace: %s", err.Error())
+ //  return
+ // }
 
- for _, n := range ns {
- fmt.Println(n)
- }
+ // for _, n := range ns {
+ //  fmt.Println(n)
+ // }
 
  qres := &repo.DatasetRef{}
  if err = req.Run(&RunParams{
@@ -160,7 +160,7 @@ func TestDatasetQueries(t *testing.T) {
  err string
  }{
  {&DatasetQueriesParams{}, []*repo.DatasetRef{}, "path is required"},
- {&DatasetQueriesParams{Path: path.String()}, []*repo.DatasetRef{}, ""},
+ {&DatasetQueriesParams{Path: path.String()}, []*repo.DatasetRef{&repo.DatasetRef{}}, ""},
  // TODO: add more tests
  }
 

diff --git a/repo/graph_test.go b/repo/graph_test.go
@@ -65,7 +65,7 @@ func TestDatasetQueries(t *testing.T) {
  }
 
  qs := DatasetQueries(node)
- expect := 1
+ expect := 2
  if len(qs) != expect {
  t.Errorf("query count mismatch, expected: %d, got: %d", expect, len(qs))
  }