Scouting: Make TeamNumber in the TeamMatch object a string
Signed-off-by: Emily Markova <emily.markova@gmail.com>
Change-Id: I7c8dca66bbc10aadfff8cee174402dca9c66b242
diff --git a/scouting/webserver/match_list/match_list.go b/scouting/webserver/match_list/match_list.go
index 9029438..c5af661 100644
--- a/scouting/webserver/match_list/match_list.go
+++ b/scouting/webserver/match_list/match_list.go
@@ -97,32 +97,32 @@
{
MatchNumber: int32(match.MatchNumber),
SetNumber: int32(match.SetNumber), CompLevel: match.CompLevel,
- Alliance: "R", AlliancePosition: 1, TeamNumber: red[0],
+ Alliance: "R", AlliancePosition: 1, TeamNumber: strconv.Itoa(int(red[0])),
},
{
MatchNumber: int32(match.MatchNumber),
SetNumber: int32(match.SetNumber), CompLevel: match.CompLevel,
- Alliance: "R", AlliancePosition: 2, TeamNumber: red[1],
+ Alliance: "R", AlliancePosition: 2, TeamNumber: strconv.Itoa(int(red[1])),
},
{
MatchNumber: int32(match.MatchNumber),
SetNumber: int32(match.SetNumber), CompLevel: match.CompLevel,
- Alliance: "R", AlliancePosition: 3, TeamNumber: red[2],
+ Alliance: "R", AlliancePosition: 3, TeamNumber: strconv.Itoa(int(red[2])),
},
{
MatchNumber: int32(match.MatchNumber),
SetNumber: int32(match.SetNumber), CompLevel: match.CompLevel,
- Alliance: "B", AlliancePosition: 1, TeamNumber: blue[0],
+ Alliance: "B", AlliancePosition: 1, TeamNumber: strconv.Itoa(int(blue[0])),
},
{
MatchNumber: int32(match.MatchNumber),
SetNumber: int32(match.SetNumber), CompLevel: match.CompLevel,
- Alliance: "B", AlliancePosition: 2, TeamNumber: blue[1],
+ Alliance: "B", AlliancePosition: 2, TeamNumber: strconv.Itoa(int(blue[1])),
},
{
MatchNumber: int32(match.MatchNumber),
SetNumber: int32(match.SetNumber), CompLevel: match.CompLevel,
- Alliance: "B", AlliancePosition: 3, TeamNumber: blue[2],
+ Alliance: "B", AlliancePosition: 3, TeamNumber: strconv.Itoa(int(blue[2])),
},
}
diff --git a/scouting/webserver/requests/messages/request_all_matches_response.fbs b/scouting/webserver/requests/messages/request_all_matches_response.fbs
index 9404675..55da7bb 100644
--- a/scouting/webserver/requests/messages/request_all_matches_response.fbs
+++ b/scouting/webserver/requests/messages/request_all_matches_response.fbs
@@ -14,12 +14,12 @@
match_number:int (id: 0);
set_number:int (id: 1);
comp_level:string (id: 2);
- r1:int (id: 3);
- r2:int (id: 4);
- r3:int (id: 5);
- b1:int (id: 6);
- b2:int (id: 7);
- b3:int (id: 8);
+ r1:string (id: 3);
+ r2:string (id: 4);
+ r3:string (id: 5);
+ b1:string (id: 6);
+ b2:string (id: 7);
+ b3:string (id: 8);
// Tells you how completely we've data scouted this match.
data_scouted: ScoutedLevel (id: 9);
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 6f83bfe..3aa9076 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -232,9 +232,9 @@
return -1, errors.New(fmt.Sprint("Failed to find comp level ", comp_level, " in list ", list))
}
-func (handler requestAllMatchesHandler) teamHasBeenDataScouted(key MatchAssemblyKey, teamNumber int32) (bool, error) {
+func (handler requestAllMatchesHandler) teamHasBeenDataScouted(key MatchAssemblyKey, teamNumber string) (bool, error) {
stats, err := handler.db.ReturnStats2023ForTeam(
- strconv.Itoa(int(teamNumber)), key.MatchNumber, key.SetNumber, key.CompLevel)
+ teamNumber, key.MatchNumber, key.SetNumber, key.CompLevel)
if err != nil {
return false, err
}
@@ -277,7 +277,7 @@
}
}
- var team *int32
+ var team *string
var dataScoutedTeam *bool
// Fill in the field for the match that we have in in the
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index dbad955..50d6820 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -128,75 +128,75 @@
matches: []db.TeamMatch{
{
MatchNumber: 1, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 1, TeamNumber: 5,
+ Alliance: "R", AlliancePosition: 1, TeamNumber: "5",
},
{
MatchNumber: 1, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 2, TeamNumber: 42,
+ Alliance: "R", AlliancePosition: 2, TeamNumber: "42",
},
{
MatchNumber: 1, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 3, TeamNumber: 600,
+ Alliance: "R", AlliancePosition: 3, TeamNumber: "600",
},
{
MatchNumber: 1, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 1, TeamNumber: 971,
+ Alliance: "B", AlliancePosition: 1, TeamNumber: "971",
},
{
MatchNumber: 1, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 2, TeamNumber: 400,
+ Alliance: "B", AlliancePosition: 2, TeamNumber: "400",
},
{
MatchNumber: 1, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 3, TeamNumber: 200,
+ Alliance: "B", AlliancePosition: 3, TeamNumber: "200",
},
{
MatchNumber: 2, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 1, TeamNumber: 6,
+ Alliance: "R", AlliancePosition: 1, TeamNumber: "6",
},
{
MatchNumber: 2, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 2, TeamNumber: 43,
+ Alliance: "R", AlliancePosition: 2, TeamNumber: "43",
},
{
MatchNumber: 2, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 3, TeamNumber: 601,
+ Alliance: "R", AlliancePosition: 3, TeamNumber: "601",
},
{
MatchNumber: 2, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 1, TeamNumber: 972,
+ Alliance: "B", AlliancePosition: 1, TeamNumber: "972",
},
{
MatchNumber: 2, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 2, TeamNumber: 401,
+ Alliance: "B", AlliancePosition: 2, TeamNumber: "401",
},
{
MatchNumber: 2, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 3, TeamNumber: 201,
+ Alliance: "B", AlliancePosition: 3, TeamNumber: "201",
},
{
MatchNumber: 3, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 1, TeamNumber: 7,
+ Alliance: "R", AlliancePosition: 1, TeamNumber: "7",
},
{
MatchNumber: 3, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 2, TeamNumber: 44,
+ Alliance: "R", AlliancePosition: 2, TeamNumber: "44",
},
{
MatchNumber: 3, SetNumber: 1, CompLevel: "qm",
- Alliance: "R", AlliancePosition: 3, TeamNumber: 602,
+ Alliance: "R", AlliancePosition: 3, TeamNumber: "602",
},
{
MatchNumber: 3, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 1, TeamNumber: 973,
+ Alliance: "B", AlliancePosition: 1, TeamNumber: "973",
},
{
MatchNumber: 3, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 2, TeamNumber: 402,
+ Alliance: "B", AlliancePosition: 2, TeamNumber: "402",
},
{
MatchNumber: 3, SetNumber: 1, CompLevel: "qm",
- Alliance: "B", AlliancePosition: 3, TeamNumber: 202,
+ Alliance: "B", AlliancePosition: 3, TeamNumber: "202",
},
},
// Pretend that we have some data scouting data.
@@ -242,7 +242,7 @@
// R1, R2, R3, B1, B2, B3
{
1, 1, "qm",
- 5, 42, 600, 971, 400, 200,
+ "5", "42", "600", "971", "400", "200",
&request_all_matches_response.ScoutedLevelT{
// The R1 team has already been data
// scouted.
@@ -251,14 +251,14 @@
},
{
2, 1, "qm",
- 6, 43, 601, 972, 401, 201,
+ "6", "43", "601", "972", "401", "201",
&request_all_matches_response.ScoutedLevelT{
false, false, false, false, false, false,
},
},
{
3, 1, "qm",
- 7, 44, 602, 973, 402, 202,
+ "7", "44", "602", "973", "402", "202",
&request_all_matches_response.ScoutedLevelT{
// The B1 team has already been data
// scouted.