Make team number a string
Signed-off-by: Emily Markova <emily.markova@gmail.com>
Change-Id: Ia1cff2cfb854e2202cbcaee6f1fd22fc7efd1c15
diff --git a/scouting/db/db.go b/scouting/db/db.go
index 578edb6..cf1c823 100644
--- a/scouting/db/db.go
+++ b/scouting/db/db.go
@@ -82,7 +82,7 @@
type NotesData struct {
ID uint `gorm:"primaryKey"`
- TeamNumber int32
+ TeamNumber string
Notes string
GoodDriving bool
BadDriving bool
@@ -94,7 +94,7 @@
}
type Ranking struct {
- TeamNumber int `gorm:"primaryKey"`
+ TeamNumber string `gorm:"primaryKey"`
Losses, Wins, Ties int32
Rank, Dq int32
}
@@ -108,9 +108,9 @@
ID uint `gorm:"primaryKey"`
MatchNumber int32
- Rank1 int32
- Rank2 int32
- Rank3 int32
+ Rank1 string
+ Rank2 string
+ Rank3 string
}
type ParsedDriverRankingData struct {
@@ -340,14 +340,14 @@
return shifts, result.Error
}
-func (database *Database) QueryActions(teamNumber_ int) ([]Action, error) {
+func (database *Database) QueryActions(teamNumber_ string) ([]Action, error) {
var actions []Action
result := database.
Where("team_number = ?", teamNumber_).Find(&actions)
return actions, result.Error
}
-func (database *Database) QueryNotes(TeamNumber int32) ([]string, error) {
+func (database *Database) QueryNotes(TeamNumber string) ([]string, error) {
var rawNotes []NotesData
result := database.Where("team_number = ?", TeamNumber).Find(&rawNotes)
if result.Error != nil {
@@ -361,7 +361,7 @@
return notes, nil
}
-func (database *Database) QueryRankings(TeamNumber int) ([]Ranking, error) {
+func (database *Database) QueryRankings(TeamNumber string) ([]Ranking, error) {
var rankins []Ranking
result := database.Where("team_number = ?", TeamNumber).Find(&rankins)
return rankins, result.Error
diff --git a/scouting/db/db_test.go b/scouting/db/db_test.go
index 94dce7e..d7001b8 100644
--- a/scouting/db/db_test.go
+++ b/scouting/db/db_test.go
@@ -114,12 +114,12 @@
correct := []Ranking{
Ranking{
- TeamNumber: 123,
+ TeamNumber: "123",
Losses: 1, Wins: 7, Ties: 0,
Rank: 2, Dq: 0,
},
Ranking{
- TeamNumber: 125,
+ TeamNumber: "125",
Losses: 2, Wins: 4, Ties: 0,
Rank: 2, Dq: 0,
},
@@ -691,22 +691,22 @@
testDatabase := []Ranking{
Ranking{
- TeamNumber: 123,
+ TeamNumber: "123",
Losses: 1, Wins: 7, Ties: 2,
Rank: 2, Dq: 0,
},
Ranking{
- TeamNumber: 124,
+ TeamNumber: "124",
Losses: 3, Wins: 4, Ties: 0,
Rank: 4, Dq: 2,
},
Ranking{
- TeamNumber: 125,
+ TeamNumber: "125",
Losses: 5, Wins: 2, Ties: 0,
Rank: 17, Dq: 0,
},
Ranking{
- TeamNumber: 126,
+ TeamNumber: "126",
Losses: 0, Wins: 7, Ties: 0,
Rank: 5, Dq: 0,
},
@@ -719,13 +719,13 @@
correct := []Ranking{
Ranking{
- TeamNumber: 126,
+ TeamNumber: "126",
Losses: 0, Wins: 7, Ties: 0,
Rank: 5, Dq: 0,
},
}
- got, err := fixture.db.QueryRankings(126)
+ got, err := fixture.db.QueryRankings("126")
check(t, err, "Failed QueryRankings()")
if !reflect.DeepEqual(correct, got) {
@@ -830,22 +830,22 @@
correct := []Ranking{
Ranking{
- TeamNumber: 123,
+ TeamNumber: "123",
Losses: 1, Wins: 7, Ties: 2,
Rank: 2, Dq: 0,
},
Ranking{
- TeamNumber: 124,
+ TeamNumber: "124",
Losses: 3, Wins: 4, Ties: 0,
Rank: 4, Dq: 2,
},
Ranking{
- TeamNumber: 125,
+ TeamNumber: "125",
Losses: 5, Wins: 2, Ties: 0,
Rank: 17, Dq: 0,
},
Ranking{
- TeamNumber: 126,
+ TeamNumber: "126",
Losses: 0, Wins: 7, Ties: 0,
Rank: 5, Dq: 0,
},
@@ -1021,27 +1021,27 @@
testDatabase := []Ranking{
Ranking{
- TeamNumber: 123,
+ TeamNumber: "123",
Losses: 1, Wins: 7, Ties: 2,
Rank: 2, Dq: 0,
},
Ranking{
- TeamNumber: 124,
+ TeamNumber: "124",
Losses: 3, Wins: 4, Ties: 0,
Rank: 4, Dq: 2,
},
Ranking{
- TeamNumber: 125,
+ TeamNumber: "125",
Losses: 5, Wins: 2, Ties: 0,
Rank: 17, Dq: 0,
},
Ranking{
- TeamNumber: 126,
+ TeamNumber: "126",
Losses: 0, Wins: 7, Ties: 0,
Rank: 5, Dq: 0,
},
Ranking{
- TeamNumber: 125,
+ TeamNumber: "125",
Losses: 2, Wins: 4, Ties: 1,
Rank: 5, Dq: 0,
},
@@ -1054,13 +1054,13 @@
correct := []Ranking{
Ranking{
- TeamNumber: 125,
+ TeamNumber: "125",
Losses: 2, Wins: 4, Ties: 1,
Rank: 5, Dq: 0,
},
}
- got, err := fixture.db.QueryRankings(125)
+ got, err := fixture.db.QueryRankings("125")
check(t, err, "Failed QueryRankings()")
checkDeepEqual(t, correct, got)
@@ -1072,14 +1072,14 @@
expected := []string{"Note 1", "Note 3"}
- err := fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 1", GoodDriving: true, BadDriving: false, SolidPlacing: false, SketchyPlacing: true, GoodDefense: false, BadDefense: true, EasilyDefended: true})
+ err := fixture.db.AddNotes(NotesData{TeamNumber: "1234", Notes: "Note 1", GoodDriving: true, BadDriving: false, SolidPlacing: false, SketchyPlacing: true, GoodDefense: false, BadDefense: true, EasilyDefended: true})
check(t, err, "Failed to add Note")
- err = fixture.db.AddNotes(NotesData{TeamNumber: 1235, Notes: "Note 2", GoodDriving: false, BadDriving: true, SolidPlacing: false, SketchyPlacing: true, GoodDefense: false, BadDefense: false, EasilyDefended: false})
+ err = fixture.db.AddNotes(NotesData{TeamNumber: "1235", Notes: "Note 2", GoodDriving: false, BadDriving: true, SolidPlacing: false, SketchyPlacing: true, GoodDefense: false, BadDefense: false, EasilyDefended: false})
check(t, err, "Failed to add Note")
- err = fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 3", GoodDriving: true, BadDriving: false, SolidPlacing: false, SketchyPlacing: true, GoodDefense: true, BadDefense: false, EasilyDefended: true})
+ err = fixture.db.AddNotes(NotesData{TeamNumber: "1234", Notes: "Note 3", GoodDriving: true, BadDriving: false, SolidPlacing: false, SketchyPlacing: true, GoodDefense: true, BadDefense: false, EasilyDefended: true})
check(t, err, "Failed to add Note")
- actual, err := fixture.db.QueryNotes(1234)
+ actual, err := fixture.db.QueryNotes("1234")
check(t, err, "Failed to get Notes")
if !reflect.DeepEqual(expected, actual) {
@@ -1092,20 +1092,20 @@
defer fixture.TearDown()
expected := []DriverRankingData{
- {ID: 1, MatchNumber: 12, Rank1: 1234, Rank2: 1235, Rank3: 1236},
- {ID: 2, MatchNumber: 12, Rank1: 1236, Rank2: 1235, Rank3: 1234},
+ {ID: 1, MatchNumber: 12, Rank1: "1234", Rank2: "1235", Rank3: "1236"},
+ {ID: 2, MatchNumber: 12, Rank1: "1236", Rank2: "1235", Rank3: "1234"},
}
err := fixture.db.AddDriverRanking(
- DriverRankingData{MatchNumber: 12, Rank1: 1234, Rank2: 1235, Rank3: 1236},
+ DriverRankingData{MatchNumber: 12, Rank1: "1234", Rank2: "1235", Rank3: "1236"},
)
check(t, err, "Failed to add Driver Ranking")
err = fixture.db.AddDriverRanking(
- DriverRankingData{MatchNumber: 12, Rank1: 1236, Rank2: 1235, Rank3: 1234},
+ DriverRankingData{MatchNumber: 12, Rank1: "1236", Rank2: "1235", Rank3: "1234"},
)
check(t, err, "Failed to add Driver Ranking")
err = fixture.db.AddDriverRanking(
- DriverRankingData{MatchNumber: 13, Rank1: 1235, Rank2: 1234, Rank3: 1236},
+ DriverRankingData{MatchNumber: 13, Rank1: "1235", Rank2: "1234", Rank3: "1236"},
)
check(t, err, "Failed to add Driver Ranking")