Skip to content

Commit

Permalink
[Backend] Bug fix: applying filter in listing versions (#4052)
Browse files Browse the repository at this point in the history
* enable pagination when expanding experiment in both the home page and the archive page

* Revert "enable pagination when expanding experiment in both the home page and the archive page"

This reverts commit 5b67273.

* add filter for listing versions

* add another filter in test

* comment revision
  • Loading branch information
jingzhang36 authored and Bobgy committed Jul 2, 2020
1 parent 842e8ce commit 3243f73
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 1 deletion.
2 changes: 1 addition & 1 deletion backend/src/apiserver/storage/pipeline_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ func (s *PipelineStore) ListPipelineVersions(pipelineId string, opts *list.Optio
}

buildQuery := func(sqlBuilder sq.SelectBuilder) sq.SelectBuilder {
return sqlBuilder.
return opts.AddFilterToSelect(sqlBuilder).
From("pipeline_versions").
Where(sq.And{sq.Eq{"PipelineId": pipelineId}, sq.Eq{"status": model.PipelineVersionReady}})
}
Expand Down
83 changes: 83 additions & 0 deletions backend/src/apiserver/storage/pipeline_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,89 @@ func TestListPipelineVersions_Pagination_LessThanPageSize(t *testing.T) {
})
}

func TestListPipelineVersions_WithFilter(t *testing.T) {
db := NewFakeDbOrFatal()
defer db.Close()
pipelineStore := NewPipelineStore(
db,
util.NewFakeTimeForEpoch(),
util.NewFakeUUIDGeneratorOrFatal(fakeUUID, nil))

// Create a pipeline.
pipelineStore.CreatePipeline(
&model.Pipeline{
Name: "pipeline_1",
Parameters: `[{"Name": "param1"}]`,
Status: model.PipelineReady,
})

// Create "version_1" with fakeUUIDTwo.
pipelineStore.uuid = util.NewFakeUUIDGeneratorOrFatal(fakeUUIDTwo, nil)
pipelineStore.CreatePipelineVersion(
&model.PipelineVersion{
Name: "pipeline_version_1",
Parameters: `[{"Name": "param1"}]`,
PipelineId: fakeUUID,
Status: model.PipelineVersionReady,
})

// Create "version_2" with fakeUUIDThree.
pipelineStore.uuid = util.NewFakeUUIDGeneratorOrFatal(fakeUUIDThree, nil)
pipelineStore.CreatePipelineVersion(
&model.PipelineVersion{
Name: "pipeline_version_2",
Parameters: `[{"Name": "param1"}]`,
PipelineId: fakeUUID,
Status: model.PipelineVersionReady,
})

// Filter for name being equal to pipeline_version_1
equalFilterProto := &api.Filter{
Predicates: []*api.Predicate{
&api.Predicate{
Key: "name",
Op: api.Predicate_EQUALS,
Value: &api.Predicate_StringValue{StringValue: "pipeline_version_1"},
},
},
}

// Filter for name prefix being pipeline_version
prefixFilterProto := &api.Filter{
Predicates: []*api.Predicate{
&api.Predicate{
Key: "name",
Op: api.Predicate_IS_SUBSTRING,
Value: &api.Predicate_StringValue{StringValue: "pipeline_version"},
},
},
}

// Only return 1 pipeline version with equal filter.
opts, err := list.NewOptions(&model.PipelineVersion{}, 10, "id", equalFilterProto)
assert.Nil(t, err)
_, totalSize, nextPageToken, err := pipelineStore.ListPipelineVersions(fakeUUID, opts)
assert.Nil(t, err)
assert.Equal(t, "", nextPageToken)
assert.Equal(t, 1, totalSize)

// Return 2 pipeline versions without filter.
opts, err = list.NewOptions(&model.PipelineVersion{}, 10, "id", nil)
assert.Nil(t, err)
_, totalSize, nextPageToken, err = pipelineStore.ListPipelineVersions(fakeUUID, opts)
assert.Nil(t, err)
assert.Equal(t, "", nextPageToken)
assert.Equal(t, 2, totalSize)

// Return 2 pipeline versions with prefix filter.
opts, err = list.NewOptions(&model.PipelineVersion{}, 10, "id", prefixFilterProto)
assert.Nil(t, err)
_, totalSize, nextPageToken, err = pipelineStore.ListPipelineVersions(fakeUUID, opts)
assert.Nil(t, err)
assert.Equal(t, "", nextPageToken)
assert.Equal(t, 2, totalSize)
}

func TestListPipelineVersionsError(t *testing.T) {
db := NewFakeDbOrFatal()
defer db.Close()
Expand Down

0 comments on commit 3243f73

Please sign in to comment.