scouting: Unify the spelling of "timestamp"
We use both "time stamp" and "timestamp". This makes for inconsistent
code. It's confusing to use one spelling in one part of the code and
another spelling in another part.
The internet seems to agree on "timestamp" so let's go with that.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I0f596fe21935ed48520cac26958686a7026aaf6e
diff --git a/scouting/db/db.go b/scouting/db/db.go
index 18d54a4..ac9a6e8 100644
--- a/scouting/db/db.go
+++ b/scouting/db/db.go
@@ -62,9 +62,8 @@
CompLevel string `gorm:"primaryKey"`
// This contains a serialized scouting.webserver.requests.ActionType flatbuffer.
CompletedAction []byte
- // TODO(phil): Get all the spellings of "timestamp" to be the same.
- TimeStamp int64 `gorm:"primaryKey"`
- CollectedBy string
+ Timestamp int64 `gorm:"primaryKey"`
+ CollectedBy string
}
type NotesData struct {
diff --git a/scouting/db/db_test.go b/scouting/db/db_test.go
index 9d1184a..8a4c0bc 100644
--- a/scouting/db/db_test.go
+++ b/scouting/db/db_test.go
@@ -813,27 +813,27 @@
correct := []Action{
Action{
TeamNumber: "1235", MatchNumber: 94, SetNumber: 1, CompLevel: "quals",
- CompletedAction: []byte(""), TimeStamp: 0000, CollectedBy: "",
+ CompletedAction: []byte(""), Timestamp: 0000, CollectedBy: "",
},
Action{
TeamNumber: "1236", MatchNumber: 94, SetNumber: 1, CompLevel: "quals",
- CompletedAction: []byte(""), TimeStamp: 0321, CollectedBy: "",
+ CompletedAction: []byte(""), Timestamp: 0321, CollectedBy: "",
},
Action{
TeamNumber: "1237", MatchNumber: 94, SetNumber: 1, CompLevel: "quals",
- CompletedAction: []byte(""), TimeStamp: 0222, CollectedBy: "",
+ CompletedAction: []byte(""), Timestamp: 0222, CollectedBy: "",
},
Action{
TeamNumber: "1238", MatchNumber: 94, SetNumber: 1, CompLevel: "quals",
- CompletedAction: []byte(""), TimeStamp: 0110, CollectedBy: "",
+ CompletedAction: []byte(""), Timestamp: 0110, CollectedBy: "",
},
Action{
TeamNumber: "1239", MatchNumber: 94, SetNumber: 1, CompLevel: "quals",
- CompletedAction: []byte(""), TimeStamp: 0004, CollectedBy: "",
+ CompletedAction: []byte(""), Timestamp: 0004, CollectedBy: "",
},
Action{
TeamNumber: "1233", MatchNumber: 94, SetNumber: 1, CompLevel: "quals",
- CompletedAction: []byte(""), TimeStamp: 0005, CollectedBy: "",
+ CompletedAction: []byte(""), Timestamp: 0005, CollectedBy: "",
},
}
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 4950999..37a6ff2 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -834,7 +834,7 @@
CompLevel: string(request.CompLevel()),
//TODO: Serialize CompletedAction
CompletedAction: []byte{},
- TimeStamp: action.Timestamp(),
+ Timestamp: action.Timestamp(),
CollectedBy: username,
}
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index 290221a..c1fe860 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -869,7 +869,7 @@
CompLevel: "qual",
CollectedBy: "debug_cli",
CompletedAction: []byte{},
- TimeStamp: 2400,
+ Timestamp: 2400,
},
{
PreScouting: true,
@@ -879,7 +879,7 @@
CompLevel: "qual",
CollectedBy: "debug_cli",
CompletedAction: []byte{},
- TimeStamp: 1009,
+ Timestamp: 1009,
},
}