commit ed1f44624ae785513b0b50e84ce2ec96a5a6af70
author Philipp Schrader <philipp.schrader+971@gmail.com> Wed May 24 20:12:32 2023 -0700
committer Gerrit Code Review <gerrit@software.frc971.org> Wed May 24 20:12:32 2023 -0700
tree 4d34f7bc141f7d9c70745812c1c20231db1054c1
parent caf25a6679a57e140e7ab49ef2ec88db263d0a7d
parent 670a1c8a01aaa4212b06dfcc9932b56318450af9

Merge "scouting: Unify the spelling of "timestamp""

scouting/db/db.go

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 {

scouting/db/db_test.go

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: "",
 		},
 	}
 

scouting/webserver/requests/requests.go

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,
 		}
 

scouting/webserver/requests/requests_test.go

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,
 		},
 	}