commit 9b4eb3106a67fa700abc00969d95eaaef050c6c8
author Sabina Leaver <100027607@mvla.net> Mon Feb 20 19:58:17 2023 -0800
committer Sabina Leaver <100027607@mvla.net> Wed Apr 12 20:54:58 2023 -0700
tree 71957daad3137294c99e1f4f6727e3a6f27f1abd
parent 5ec00230799c0a89be3ebe18b9806ae7bb75dfda

Scouting: Add handler for actions in db.go

Signed-off-by: Sabina Leaver <100027607@mvla.net>
Change-Id: I234a4a838c236dcea209aa1fbceefb0b6566dc08

scouting/db/db.go

diff --git a/scouting/db/db.go b/scouting/db/db.go
index 718711c..ca1af9e 100644
--- a/scouting/db/db.go
+++ b/scouting/db/db.go
@@ -48,14 +48,14 @@
 }
 
 type Action struct {
-	TeamNumber      string `gorm:"primaryKey"`
-	MatchNumber     int32  `gorm:"primaryKey"`
-	SetNumber       int32  `gorm:"primaryKey"`
-	CompLevel       string `gorm:"primaryKey"`
-	CompletedAction []byte
+	TeamNumber  string `gorm:"primaryKey"`
+	MatchNumber int32  `gorm:"primaryKey"`
+	SetNumber   int32  `gorm:"primaryKey"`
+	CompLevel   string `gorm:"primaryKey"`
 	// This contains a serialized scouting.webserver.requests.ActionType flatbuffer.
-	TimeStamp   int32 `gorm:"primaryKey"`
-	CollectedBy string
+	CompletedAction []byte
+	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 ea83fa3..b0d34d8 100644
--- a/scouting/db/db_test.go
+++ b/scouting/db/db_test.go
@@ -761,27 +761,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: 0004, CollectedBy: "",
+			CompletedAction: []byte(""), Timestamp: 0005, CollectedBy: "",
 		},
 	}