Merge pull request #59 from aau-network-security/develop

Develop
aau-network-security · Aug 18, 2021 · 41651f8 · 41651f8
2 parents e98175d + e63d827
commit 41651f8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/database/query.go b/database/query.go
@@ -14,7 +14,7 @@ var (
 		"finish_expected timestamp, " +
 		"finished_at timestamp," +
 		"createdBy text," +
-		"onlyVPN boolean," +
+		"onlyVPN integer," +
 		"secretKey text," +
 		"disabledExercises text);"
 

diff --git a/database/store_test.go b/database/store_test.go
@@ -213,7 +213,7 @@ func TestAddEvent(t *testing.T) {
 		Status:             1,
 		ExpectedFinishTime: "2020-05-21 14:35:01",
 		FinishedAt:         "0001-01-01 00:00:00", // it means that event is not finished yet
-		OnlyVPN:            false,
+		OnlyVPN:            0,
 		SecretKey:          "",
 		DisabledExercises:  "",
 	}
@@ -342,7 +342,7 @@ func TestMultipleEventWithSameTag(t *testing.T) {
 		Capacity:           2,
 		StartTime:          "2020-06-20 14:35:01",
 		ExpectedFinishTime: "2020-06-21 14:35:01",
-		OnlyVPN:            false,
+		OnlyVPN:            0,
 		SecretKey:          "",
 		DisabledExercises:  "",
 	}

diff --git a/model/model.go b/model/model.go
@@ -13,7 +13,7 @@ type Event struct {
 	ExpectedFinishTime string
 	FinishedAt         string
 	CreatedBy          string
-	OnlyVPN            bool
+	OnlyVPN            int32
 	SecretKey          string
 	DisabledExercises  string
 }

diff --git a/proto/store.pb.go b/proto/store.pb.go
diff --git a/proto/store.proto b/proto/store.proto
@@ -128,7 +128,7 @@ message AddEventRequest{
     string finishedAt = 9;
     int32 status = 10;
     string createdBy = 11;
-    bool onlyVPN = 12;
+    int32 onlyVPN = 12;
     string secretKey = 13;
     string disabledExercises = 14;
 }
@@ -159,7 +159,7 @@ message GetEventResponse{
         string finishedAt = 9;
         int32 status = 10;
         string createdBy =11;
-        bool onlyVPN = 12;
+        int32 onlyVPN = 12;  // 0 browser // 1 VPN 2 // VPN + Browser
         string secretKey = 13;
         string disabledExercises = 14;
     }