Skip to content

Commit 50b1f98

Browse files
committed
add onlyVPN to test and response
Signed-off-by: Ahmet Turkmen <f.ahmet.turkmen@icloud.com>
1 parent d6fd977 commit 50b1f98

File tree

7 files changed

+81
-69
lines changed

7 files changed

+81
-69
lines changed

database/store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func parseEvents(rows *sql.Rows) ([]model.Event, error) {
321321
for rows.Next() {
322322
event := new(model.Event)
323323
err := rows.Scan(&event.Id, &event.Tag, &event.Name, &event.Available, &event.Capacity, &event.Status, &event.Frontends,
324-
&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy)
324+
&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy, &event.OnlyVPN)
325325
if err != nil && !strings.Contains(err.Error(), handleNullConversionError) {
326326
return nil, err
327327
}

database/store_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ func TestAddEvent(t *testing.T) {
213213
Status: 1,
214214
ExpectedFinishTime: "2020-05-21 14:35:01",
215215
FinishedAt: "0001-01-01 00:00:00", // it means that event is not finished yet
216+
OnlyVPN: false,
216217
}
217218

218219
resp, err := c.AddEvent(context.Background(), &req)

database/timeline.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func getEvents(db *sql.DB) []model.Event {
7272
for r.Next() {
7373
event := new(model.Event)
7474
err := r.Scan(&event.Id, &event.Tag, &event.Name, &event.Available, &event.Capacity, &event.Status, &event.Frontends,
75-
&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy)
75+
&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy, &event.OnlyVPN)
7676
if err != nil && !strings.Contains(err.Error(), "Null conversion error ") {
7777
log.Fatalf("Error on scanning query %v", err)
7878
}

database/timeline_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ func TestGetEvents(t *testing.T) {
212212
ExpectedFinishTime: expectedFinishTime.Format(time.RFC3339),
213213
FinishedAt: time.Date(0001, 01, 01, 00, 00, 00, 0000, time.UTC).Format(time.RFC3339),
214214
CreatedBy: "tester",
215+
OnlyVPN: false,
215216
}}
216217

217218
if got := getEvents(db); !reflect.DeepEqual(got, events) {

model/model.go

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ type Event struct {
1313
ExpectedFinishTime string
1414
FinishedAt string
1515
CreatedBy string
16+
OnlyVPN bool
1617
}
1718

1819
type Team struct {

proto/store.pb.go

+75-67
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/store.proto

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ message GetEventResponse{
115115
string finishedAt = 9;
116116
int32 status = 10;
117117
string createdBy =11;
118+
bool onlyVPN = 12;
118119
}
119120
repeated Events events = 1;
120121
string errorMessage = 2;

0 commit comments

Comments
 (0)