Commit 5ecc5ca8 authored by Rafal Augustyniak's avatar Rafal Augustyniak
Browse files

make properties public

parent b494fd70
Showing with 29 additions and 29 deletions
+29 -29
...@@ -10,16 +10,16 @@ import ( ...@@ -10,16 +10,16 @@ import (
) )
type ExperimentRun struct { type ExperimentRun struct {
id uint64 Id uint64
startTime time.Time StartTime time.Time
endTime sql.NullTime EndTime sql.NullTime
cancellationTime sql.NullTime CancellationTime sql.NullTime
creationTime time.Time creationTime time.Time
} }
func (er *ExperimentRun) CreateProperties(now time.Time) ([]*experimentation.Property, error) { func (er *ExperimentRun) CreateProperties(now time.Time) ([]*experimentation.Property, error) {
status := timesToStatus(er.startTime, er.endTime, er.cancellationTime, now) status := timesToStatus(er.StartTime, er.EndTime, er.CancellationTime, now)
startTimeTimestamp, err := ptypes.TimestampProto(er.startTime) startTimeTimestamp, err := ptypes.TimestampProto(er.StartTime)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -33,7 +33,7 @@ func (er *ExperimentRun) CreateProperties(now time.Time) ([]*experimentation.Pro ...@@ -33,7 +33,7 @@ func (er *ExperimentRun) CreateProperties(now time.Time) ([]*experimentation.Pro
{ {
Id: "run_identifier", Id: "run_identifier",
Label: "Run Identifier", Label: "Run Identifier",
Value: &experimentation.Property_IntValue{IntValue: int64(er.id)}, Value: &experimentation.Property_IntValue{IntValue: int64(er.Id)},
}, },
{ {
Id: "status", Id: "status",
...@@ -53,10 +53,10 @@ func (er *ExperimentRun) CreateProperties(now time.Time) ([]*experimentation.Pro ...@@ -53,10 +53,10 @@ func (er *ExperimentRun) CreateProperties(now time.Time) ([]*experimentation.Pro
} }
var time sql.NullTime var time sql.NullTime
if er.endTime.Valid { if er.EndTime.Valid {
time = er.endTime time = er.EndTime
} else if er.cancellationTime.Valid { } else if er.CancellationTime.Valid {
time = er.cancellationTime time = er.CancellationTime
} }
endTimeTimestamp, err := TimeToPropertyDateValue(time) endTimeTimestamp, err := TimeToPropertyDateValue(time)
...@@ -70,7 +70,7 @@ func (er *ExperimentRun) CreateProperties(now time.Time) ([]*experimentation.Pro ...@@ -70,7 +70,7 @@ func (er *ExperimentRun) CreateProperties(now time.Time) ([]*experimentation.Pro
Value: endTimeTimestamp, Value: endTimeTimestamp,
}) })
cancelationTimeTimestamp, err := TimeToPropertyDateValue(er.cancellationTime) cancelationTimeTimestamp, err := TimeToPropertyDateValue(er.CancellationTime)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -23,7 +23,7 @@ func TestScheduledExperiment(t *testing.T) { ...@@ -23,7 +23,7 @@ func TestScheduledExperiment(t *testing.T) {
cancellation := sql.NullTime{Valid: false} cancellation := sql.NullTime{Valid: false}
now := startTime.AddDate(0, 0, -1) now := startTime.AddDate(0, 0, -1)
run := &ExperimentRun{id: 1, startTime: startTime, endTime: end, cancellationTime: cancellation, creationTime: creationTime} run := &ExperimentRun{Id: 1, StartTime: startTime, EndTime: end, CancellationTime: cancellation, creationTime: creationTime}
config := &ExperimentConfig{id: 2, Config: &any.Any{}} config := &ExperimentConfig{id: 2, Config: &any.Any{}}
transformer := NewTransformer(logger) transformer := NewTransformer(logger)
...@@ -43,7 +43,7 @@ func TestCanceledExperiment(t *testing.T) { ...@@ -43,7 +43,7 @@ func TestCanceledExperiment(t *testing.T) {
Valid: true, Valid: true,
} }
run := &ExperimentRun{id: 1, startTime: startTime, endTime: end, cancellationTime: cancellation, creationTime: creationTime} run := &ExperimentRun{Id: 1, StartTime: startTime, EndTime: end, CancellationTime: cancellation, creationTime: creationTime}
config := &ExperimentConfig{id: 2, Config: &any.Any{}} config := &ExperimentConfig{id: 2, Config: &any.Any{}}
transformer := NewTransformer(logger) transformer := NewTransformer(logger)
...@@ -61,7 +61,7 @@ func TestRunningExperiment(t *testing.T) { ...@@ -61,7 +61,7 @@ func TestRunningExperiment(t *testing.T) {
cancellation := sql.NullTime{Valid: false} cancellation := sql.NullTime{Valid: false}
now := startTime.AddDate(0, 0, 1) now := startTime.AddDate(0, 0, 1)
run := &ExperimentRun{id: 1, startTime: startTime, endTime: end, cancellationTime: cancellation, creationTime: creationTime} run := &ExperimentRun{Id: 1, StartTime: startTime, EndTime: end, CancellationTime: cancellation, creationTime: creationTime}
config := &ExperimentConfig{id: 2, Config: &any.Any{}} config := &ExperimentConfig{id: 2, Config: &any.Any{}}
transformer := NewTransformer(logger) transformer := NewTransformer(logger)
...@@ -84,7 +84,7 @@ func TestStoppedExperiment(t *testing.T) { ...@@ -84,7 +84,7 @@ func TestStoppedExperiment(t *testing.T) {
Valid: true, Valid: true,
} }
run := &ExperimentRun{id: 1, startTime: startTime, endTime: end, cancellationTime: cancellation, creationTime: creationTime} run := &ExperimentRun{Id: 1, StartTime: startTime, EndTime: end, CancellationTime: cancellation, creationTime: creationTime}
config := &ExperimentConfig{id: 2, Config: &any.Any{}} config := &ExperimentConfig{id: 2, Config: &any.Any{}}
transformer := NewTransformer(logger) transformer := NewTransformer(logger)
...@@ -107,7 +107,7 @@ func TestCompletedExperiment(t *testing.T) { ...@@ -107,7 +107,7 @@ func TestCompletedExperiment(t *testing.T) {
} }
now := endTime.AddDate(0, 0, 1) now := endTime.AddDate(0, 0, 1)
run := &ExperimentRun{id: 1, startTime: startTime, endTime: end, cancellationTime: cancellation, creationTime: creationTime} run := &ExperimentRun{Id: 1, StartTime: startTime, EndTime: end, CancellationTime: cancellation, creationTime: creationTime}
config := &ExperimentConfig{id: 2, Config: &any.Any{}} config := &ExperimentConfig{id: 2, Config: &any.Any{}}
transformer := NewTransformer(logger) transformer := NewTransformer(logger)
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
) )
func TestRunningExperimentRunProperties(t *testing.T) { func TestRunningExperimentRunProperties(t *testing.T) {
run := &ExperimentRun{id: 1, startTime: startTime, endTime: sql.NullTime{}, cancellationTime: sql.NullTime{}, creationTime: creationTime} run := &ExperimentRun{Id: 1, StartTime: startTime, EndTime: sql.NullTime{}, CancellationTime: sql.NullTime{}, creationTime: creationTime}
properties, err := run.CreateProperties(time.Now()) properties, err := run.CreateProperties(time.Now())
assert := assert.New(t) assert := assert.New(t)
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
) )
func NewRunDetails(run *ExperimentRun, config *ExperimentConfig, transformer *Transformer, now time.Time) (*experimentation.ExperimentRunDetails, error) { func NewRunDetails(run *ExperimentRun, config *ExperimentConfig, transformer *Transformer, now time.Time) (*experimentation.ExperimentRunDetails, error) {
status := timesToStatus(run.startTime, run.endTime, run.cancellationTime, now) status := timesToStatus(run.StartTime, run.EndTime, run.CancellationTime, now)
runProperties, err := run.CreateProperties(time.Now()) runProperties, err := run.CreateProperties(time.Now())
if err != nil { if err != nil {
...@@ -33,7 +33,7 @@ func NewRunDetails(run *ExperimentRun, config *ExperimentConfig, transformer *Tr ...@@ -33,7 +33,7 @@ func NewRunDetails(run *ExperimentRun, config *ExperimentConfig, transformer *Tr
} }
return &experimentation.ExperimentRunDetails{ return &experimentation.ExperimentRunDetails{
RunId: run.id, RunId: run.Id,
Status: status, Status: status,
Properties: &experimentation.PropertiesList{Items: properties}, Properties: &experimentation.PropertiesList{Items: properties},
Config: config.Config, Config: config.Config,
......
...@@ -30,7 +30,7 @@ func NewRunListView(run *ExperimentRun, config *ExperimentConfig, transformer *T ...@@ -30,7 +30,7 @@ func NewRunListView(run *ExperimentRun, config *ExperimentConfig, transformer *T
} }
return &experimentation.ListViewItem{ return &experimentation.ListViewItem{
Id: run.id, Id: run.Id,
Properties: &experimentation.PropertiesMap{Items: propertiesMapItems}, Properties: &experimentation.PropertiesMap{Items: propertiesMapItems},
}, nil }, nil
} }
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
func TestListViewRunningExperimentRunProperties(t *testing.T) { func TestListViewRunningExperimentRunProperties(t *testing.T) {
startTime := time.Now() startTime := time.Now()
expectedRun := &ExperimentRun{id: 1, startTime: startTime, endTime: sql.NullTime{}, cancellationTime: sql.NullTime{}, creationTime: creationTime} expectedRun := &ExperimentRun{Id: 1, StartTime: startTime, EndTime: sql.NullTime{}, CancellationTime: sql.NullTime{}, creationTime: creationTime}
expectedConfig := &ExperimentConfig{id: 2, Config: &any.Any{TypeUrl: "foo"}} expectedConfig := &ExperimentConfig{id: 2, Config: &any.Any{TypeUrl: "foo"}}
expectedProperty := &experimentation.Property{ expectedProperty := &experimentation.Property{
......
...@@ -217,7 +217,7 @@ func (s *storer) GetListView(ctx context.Context) ([]*experimentation.ListViewIt ...@@ -217,7 +217,7 @@ func (s *storer) GetListView(ctx context.Context) ([]*experimentation.ListViewIt
var details string var details string
run := ExperimentRun{} run := ExperimentRun{}
config := ExperimentConfig{Config: &any.Any{}} config := ExperimentConfig{Config: &any.Any{}}
err = rows.Scan(&run.id, &run.startTime, &run.endTime, &run.cancellationTime, &run.creationTime, &config.id, &details) err = rows.Scan(&run.Id, &run.StartTime, &run.EndTime, &run.CancellationTime, &run.creationTime, &config.id, &details)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -259,7 +259,7 @@ func (s *storer) GetExperimentRunDetails(ctx context.Context, id uint64) (*exper ...@@ -259,7 +259,7 @@ func (s *storer) GetExperimentRunDetails(ctx context.Context, id uint64) (*exper
var details string var details string
run := ExperimentRun{} run := ExperimentRun{}
config := ExperimentConfig{Config: &any.Any{}} config := ExperimentConfig{Config: &any.Any{}}
err := row.Scan(&run.id, &run.startTime, &run.endTime, &run.cancellationTime, &run.creationTime, &config.id, &details) err := row.Scan(&run.Id, &run.StartTime, &run.EndTime, &run.CancellationTime, &run.creationTime, &config.id, &details)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -14,7 +14,7 @@ func TestNoRegisteredTransformation(t *testing.T) { ...@@ -14,7 +14,7 @@ func TestNoRegisteredTransformation(t *testing.T) {
logger := zaptest.NewLogger(t).Sugar() logger := zaptest.NewLogger(t).Sugar()
transformer := NewTransformer(logger) transformer := NewTransformer(logger)
config := &ExperimentConfig{id: 1, Config: &any.Any{}} config := &ExperimentConfig{id: 1, Config: &any.Any{}}
_, err := transformer.CreateProperties(&ExperimentRun{id: 123}, config) _, err := transformer.CreateProperties(&ExperimentRun{Id: 123}, config)
assert.NoError(t, err) assert.NoError(t, err)
} }
...@@ -32,7 +32,7 @@ func TestNoMatchingRegisteredRunConfigTransform(t *testing.T) { ...@@ -32,7 +32,7 @@ func TestNoMatchingRegisteredRunConfigTransform(t *testing.T) {
} }
transformation := Transformation{ConfigTypeUrl: "bar", RunTransform: transform} transformation := Transformation{ConfigTypeUrl: "bar", RunTransform: transform}
assert.NoError(t, transformer.Register(transformation)) assert.NoError(t, transformer.Register(transformation))
properties, err := transformer.CreateProperties(&ExperimentRun{id: 123}, config) properties, err := transformer.CreateProperties(&ExperimentRun{Id: 123}, config)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 0, len(properties)) assert.Equal(t, 0, len(properties))
...@@ -41,7 +41,7 @@ func TestNoMatchingRegisteredRunConfigTransform(t *testing.T) { ...@@ -41,7 +41,7 @@ func TestNoMatchingRegisteredRunConfigTransform(t *testing.T) {
func TestMatchingRegisteredNullRunConfigTransform(t *testing.T) { func TestMatchingRegisteredNullRunConfigTransform(t *testing.T) {
logger := zaptest.NewLogger(t).Sugar() logger := zaptest.NewLogger(t).Sugar()
run := &ExperimentRun{id: 123} run := &ExperimentRun{Id: 123}
config := &ExperimentConfig{id: 1, Config: &any.Any{TypeUrl: "test"}} config := &ExperimentConfig{id: 1, Config: &any.Any{TypeUrl: "test"}}
transformation := Transformation{ConfigTypeUrl: "test"} transformation := Transformation{ConfigTypeUrl: "test"}
...@@ -56,7 +56,7 @@ func TestMatchingRegisteredNullRunConfigTransform(t *testing.T) { ...@@ -56,7 +56,7 @@ func TestMatchingRegisteredNullRunConfigTransform(t *testing.T) {
func TestMatchingRegisteredRunConfigTransform(t *testing.T) { func TestMatchingRegisteredRunConfigTransform(t *testing.T) {
logger := zaptest.NewLogger(t).Sugar() logger := zaptest.NewLogger(t).Sugar()
expectedRun := &ExperimentRun{id: 123} expectedRun := &ExperimentRun{Id: 123}
expectedConfig := &ExperimentConfig{id: 1, Config: &any.Any{TypeUrl: "test"}} expectedConfig := &ExperimentConfig{id: 1, Config: &any.Any{TypeUrl: "test"}}
expectedProperty := &experimentation.Property{ expectedProperty := &experimentation.Property{
Id: "foo", Id: "foo",
...@@ -82,7 +82,7 @@ func TestMatchingRegisteredRunConfigTransform(t *testing.T) { ...@@ -82,7 +82,7 @@ func TestMatchingRegisteredRunConfigTransform(t *testing.T) {
func TestMatchingMultipleRegisteredRunConfigTransforms(t *testing.T) { func TestMatchingMultipleRegisteredRunConfigTransforms(t *testing.T) {
logger := zaptest.NewLogger(t).Sugar() logger := zaptest.NewLogger(t).Sugar()
expectedRun := &ExperimentRun{id: 123} expectedRun := &ExperimentRun{Id: 123}
expectedConfig := &ExperimentConfig{id: 1, Config: &any.Any{TypeUrl: "foo"}} expectedConfig := &ExperimentConfig{id: 1, Config: &any.Any{TypeUrl: "foo"}}
expectedProperty1 := &experimentation.Property{ expectedProperty1 := &experimentation.Property{
Id: "foo1", Id: "foo1",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment